Object code custom description field [KFSQA-596]
Merge branch 'master' into KFSQA-596
Merge branch 'master' into KFSQA-619

Conflicts:
	features/chart_of_accounts/account_edit.feature
	features/step_definitions/chart_of_accounts/account.rb