nothing to commit
Merge github.com:cojalvo/CampusInProject

Conflicts:
	GoogleMapProject/AndroidManifest.xml
	GoogleMapProject/bin/AndroidManifest.xml
remove some files and comments for subbmition