name change
add placeholder Dashboard carousel
remove unnecessary controller methods
rm pointless db fake-populator
Merge branch 'master' into model_redef

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/users_controller.rb