Merge branch 'master' into complaints

app/views/collections/_create.html.erb

app/views/collections/_form.html.erb

app/views/devise/registrations/new.html.erb

app/views/learning_objects/_add_to_collection_btn.html.erb

app/views/learning_objects/_learning_object_horizontal.erb

app/views/learning_objects/_learning_object_vertical.erb

app/views/management/carousels/edit.html.erb

app/views/management/carousels/index.html.erb

app/views/management/carousels/new.html.erb

app/views/management/statistics/accesses.html.erb

app/views/management/statistics/collections.html.erb

app/views/management/statistics/downloads.html.erb

app/views/management/statistics/index.html.erb

app/views/management/statistics/users.html.erb

app/views/shared/application/_footer.html.erb

app/views/users/show.html.erb

app/views/welcome/contact.html.erb

app/views/welcome/faq.html.erb

app/views/welcome/index.html.erb

config/routes.rb