Profile add-on
Merge branch 'master' of https://github.com/Elioht/CalHacks

Conflicts:
	src/com/unsigned/innovations/CalHacks/FacebookFragment.java
Added firebase data to the facebook fragment, added profilepicture class to extract bitmaps from URLs
Merge branch 'master' of https://github.com/Elioht/CalHacks

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