move my_company to project menu, with its own submenu, refs #4575
fix flash message
Merge branch 'master' into my_page

Conflicts:
	config/locales/ca.yml
	init.rb