done nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/idr/notouch/app/engine/MusicPlayerCommand.java
informed the user for the cases music could not be found