Project file for only web.
Merge branch 'master' into develop
Adding basic logging
Merge branch 'develop' into va/android-network-status

Conflicts:
	src/com/fem/google/cloud/endpoints/UserEndpoint.java