Api > 14
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	jamendoholoplayer/build.gradle
	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