Merge branch 'master' into KFSQA-645
[KFSQA-645] Ready for commit.
Merge branch 'master' into KFSQA-569
Merge branch 'KFSQA-569'

Conflicts:
	features/chart_of_accounts/account_edit.feature
Merged KFSQA-569 and KFSQA-645 into master.
Removed a @wip
Resolved some issues that popped up from the merge of KFSQA-569 and KFSQA-645 into master.
Merge branch 'master' into KFSQA-728
[KFSQA-728] Merge seemed to work, so I am removing the @wip. Time to test the whole set.