One of the final commits, db work almost done
Merge branch 'master' of https://github.com/vluwer/2014-Hackathon
pull request