merging remote develop
repaired merge conflicst. all hosts now relative to appengine