Added core module
Merge branch 'app-engine' into development