fix some namespace and dependencies issues
Merge branch 'master' of github.com:mvitorino/appengine-magic