added Flow entity
added Flow entity
Merge branch 'master' into dev-flow
Merge branch 'master' into dev-flow
dao refactoring: moved general methods to generic dao