Merge remote-tracking branch 'kolyako/estimate' into estimate

Conflicts:
	db/schema.rb
app: add comments for locals on project page
app: fix error with search on boms dialog
app: fix error on transcripts page
app: fix error on deals slide menu
Merge branch 'master' into estimate
tests: fix errors with comments
Merge remote branch 'upstream/estimate' into estimate
wip