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

Conflicts:
	app/views/unit_of_works/_form.html.erb