a whole days' work, so I'm not gonna sum up all changes. Just look for yourself
another day's work
Merge branch 'master' into production
merged dao