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
remove default flag for flows
do not allow edit on user flow manager
Merge branch 'flow-manager-title' into flow-manager-query
Merge commit 'e189aaba93ca28156eb16bb4c2e548ea37a573ad' into flow-manager-title
Include default flows to user choices
Un-mark pending specs
properly serialize newly created user_flows
Merge branch 'flow-manager-query' into flow-manager-title
add test coverage to user_flow_controller
fix broken spec
Merge pull request #688 from Tahi-project/flow-manager-title

Do not allow flow edits on non admin flow manager