trying to get the android app working with gae
merge fix