refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/androidhive/scala/musicplayer/Player.scala