refs #530
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/controllers/projects_controller.rb
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
refs #521