Merge branch 'bert'
copy fix on add people fixes #1296
copy fix
Merge branch 'master' into roundproceeds
Merge branch 'master' into testing

Conflicts:
	company/profile/CompanyProfileApp.js