added changes for GAE phase 1
Merge branch 'master' of https://github.com/euromkay/PlaceIt

'needed to merge'