fix flow query specs
Merge remote-tracking branch 'origin/master' into flow-manager-query

Conflicts:
	db/schema.rb
rename role_flow to flow
Merge remote-tracking branch 'origin/master' into flow-manager-query

Conflicts:
	app/assets/javascripts/models/role.js.coffee
	db/schema.rb
Merge branch 'remove_ghost_tables' into flow-manager-query

Conflicts:
	db/schema.rb
[#83083396] admin journal policy update
remove default flag for flows
accidentally reuse var and copy-paste oopsie
do not allow edit on user flow manager
Merge branch 'flow-manager-title' into flow-manager-query
[#83870580] account for controller actions that dont have journals
Rename select2 theme files
Merge commit 'e189aaba93ca28156eb16bb4c2e548ea37a573ad' into flow-manager-title
Cleanup Navigation and Controlbar CSS

- Move to more standard BEM syntax
Remove unused phase-container class
Admin MMT css cleanup
[#83896390] Misc UX clean-up

— Styles for file upload preview
Include default flows to user choices
Merge branch 'master' into journal-admin-permissions

Conflicts:
	app/policies/admin/journals_policy.rb
[#83083396] update policy to better reflect intended behavior