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

Conflicts:
	db/schema.rb