Media Player
Media Player
Merge branch 'master' into sprint_2

Conflicts:
	NoteTaker/src/main/AndroidManifest.xml
	NoteTaker/src/main/res/layout/activity_main.xml