Merge
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	src/com/unsigned/innovations/CalHacks/MapsFragment.java