test
Merge branch 'dev-2' into development

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/greeting_controller.rb
	app/controllers/users_controller.rb