merge / sync
Merge branch 'master' of github.com:nkabrown/dispatches

Conflicts:
	app/controllers/users_controller.rb