my company
own certificate text
invoice lines form
taxes add link
highlight current menu option
merge 'my company' view

Merge remote-tracking branch 'origin/change_views' into redmine2

Conflicts:
	app/helpers/companies_helper.rb
	app/views/companies/_form.html.erb
	app/views/companies/_tax_fields.html.erb
	app/views/companies/edit.html.erb
	assets/stylesheets/haltr.css