masterMethod is added manually
Merge branch 'bootstrap'

Conflicts:
	app/controllers/users_controller.rb