Make it play music
Merge remote-tracking branch 'origin/master'

Conflicts:
	MoodPlayer/src/main/res/layout/media_player.xml