Resolve conflict

...s/stylesheets/extranet/_default/abstracts/_variables.sass

app/controllers/extranet/organizations_controller.rb

app/models/ability.rb

app/models/university/organization/facets.rb

app/models/university/person/alumnus/import.rb

app/views/extranet/home/index.html.erb

app/views/extranet/organizations/_list.erb

app/views/extranet/organizations/index.html.erb

app/views/extranet/organizations/show.html.erb

app/views/extranet/persons/show.html.erb

config/application.rb

config/locales/university/en.yml

config/locales/university/fr.yml