moved session injection to base dao
Merge branch 'master' into dev-flow