refs #316, #341
Merge branch 'dev' of github.com:projestimate/projestimate into dev
refs #321
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	app/controllers/application_controller.rb

Test refs #321