Merge branch 'frontend' of https://github.com/hdavidzhu/MobileProtoMusicSprint
FIX: Broken media player NPEs
ADD: firebase dependency
Merge branch 'master' into backend

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/hdavidzhu/mobileprotomusicsprint/MyActivity.java
Merge pull request #1 from sihrc/backend

Backend
Merge branch 'master' into backfire

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/hdavidzhu/mobileprotomusicsprint/MainFragment.java
	app/src/main/java/com/hdavidzhu/mobileprotomusicsprint/MyActivity.java