Commit Modifie css
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/assets/stylesheets/bootstrap.css
Commit Tests user_mailer  refs #303