Merge all recent changes
Merge branch 'master' of https://github.com/djmeph/cdbapp