Created DAO's for flexible persistence
Merge branch 'master' into production
merged dao
Merge branch 'production' of github.com:Novarg1/SWOP21 into production