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

Conflicts:
	app/helpers/projects_helper.rb