Removed errors that arrived from merging

All clear and deployed to app engine at build 4