Merging with nav implementation
Merge branch 'master' of github.com:elioht/CalHacks
Catching up with head
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	project.properties
	res/layout/activity_login.xml
	res/layout/email_fragment.xml
	res/layout/facebook_fragment.xml
	src/com/unsigned/innovations/CalHacks/FacebookFragment.java
	src/com/unsigned/innovations/CalHacks/MainActivity.java
	src/com/unsigned/innovations/CalHacks/MapsFragment.java
Merge branch 'master' of github.com:elioht/CalHacks

Conflicts:
	project.properties
	src/com/unsigned/innovations/CalHacks/FacebookFragment.java
	src/com/unsigned/innovations/CalHacks/MainActivity.java