Merge with master

.gitignore

Gemfile

Gemfile.lock

app/assets/images/missing.svg

app/assets/javascripts/application.js

app/assets/javascripts/search/select2.full.js

app/assets/stylesheets/application.css.scss

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/welcome.scss

app/assets/stylesheets/edges.scss

app/assets/stylesheets/learning_objects.scss

app/assets/stylesheets/registrations.scss

app/assets/stylesheets/scaffolds.scss

app/assets/stylesheets/search/select2.min.css

app/assets/stylesheets/university.scss

app/assets/stylesheets/users.scss

app/controllers/application_controller.rb

app/controllers/collections_controller.rb