added the flash messages
added the flash messages
Merge branch 'master' into authentication

Conflicts:
	app/assets/stylesheets/admin.css.scss