fix
Merge branch 'master' into multiple_roles_and_custom_fields

* master:
  fix

Conflicts:
	app/views/settings/_accounting_settings.html.erb