Harmonization of the behavior of buttons  refs#563
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/controllers/application_controller.rb