Merge remote-tracking branch 'origin/androidL' into androidL

Conflicts:
	jamendoholoplayer/src/main/java/es/oneoctopus/jamendoholoplayer/activities/BaseJamendoActivity.java
	jamendoholoplayer/src/main/java/es/oneoctopus/jamendoholoplayer/activities/MainActivity.java
	jamendoholoplayer/src/main/java/es/oneoctopus/jamendoholoplayer/activities/PlayerActivity.java
	jamendoholoplayer/src/main/res/values-v11/themes_jamendotheme.xml
Merge remote-tracking branch 'origin/androidL' into androidL