merge from master

Gemfile

Gemfile.lock

app/assets/javascripts/application.js

app/assets/javascripts/application/learning_objects.coffee

app/assets/javascripts/application/navigation-content.js

app/assets/javascripts/management/Chart.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/users.scss

app/assets/stylesheets/application/welcome.scss

app/builders/learning_object_builder.rb

app/controllers/collections_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/search_controller.rb

app/controllers/users_controller.rb

app/controllers/welcome_controller.rb

app/helpers/learning_objects_helper.rb

app/helpers/users_helper.rb

app/models/bookmarks.rb

app/models/collection.rb