commit
Merge branch 'master' of https://github.com/tgioihan/PlayOTA

Conflicts:
	src/com/appota/playota/MusicPlayer.java
	src/com/appota/playota/database/DatabaseHelper.java
	src/com/yyxu/download/services/DownloadManager.java
Merge branch 'master' of https://github.com/tgioihan/PlayOTA

Conflicts:
	src/com/appota/playota/ManagerFragment.java
	src/com/appota/playota/MusicPlayer.java