Units of measure refs:#714
Merge branch 'dev' of github.com:estimancy/projestimate into dev
Units of measure refs:#714
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	db/schema.rb