resolved some todo's
Merge branch 'master' of https://github.com/MattiasBuelens/DS-2013-GAE.git