Implementing google maps
Merge branch 'master' of github.com:elioht/CalHacks
Also, implementation of google map
Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/unsigned/innovations/CalHacks/EmailFragment.java
Merge branch 'master' of github.com:elioht/CalHacks
Caught up with commits.
Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/strings.xml
	src/com/unsigned/innovations/CalHacks/MainActivity.java