lalla
Merge branch 'master' of https://github.com/arvurb/jPlay.git

Conflicts:
	AndroidManifest.xml
	res/layout/player_new.xml
	res/layout/player_tabled.xml
	src/com/jplay/cache/CacheManager.java
	src/com/jplay/musicplayer/JPlayActivity.java
	src/com/jplay/providers/SongsManager.java
	src/com/jplay/utils/Constants.java