Finish edit_accounts
fix sort after change account filter
Finish sort_when_filter
Merge remote-tracking branch 'origin/develop' into feature/category