commit to pull
Merge branch 'master' of https://github.com/HSLUStefanBachmann/PAWI_AndroidPlaylist

Conflicts:
	AndroidPlaylisten/bin/AndroidPlaylisten.apk
	AndroidPlaylisten/bin/dexedLibs/annotations-788d503cdca716249056dd43e951eece.jar
removed bin files