Fixed Issue #6 - Misleading wording in "Sendeplan" Fixed Issue #8 SongSaver.java - replace quick and dirty solution
Fixed Issue #9 - Adding songs manually to favorites
Marquee does not force center gravity anymore, alignment corrected in plan_list_row
Merged in lippertsjan/metal-only/design (pull request #0)

Conflicts:
	res/values/strings.xml
	src/com/codingspezis/android/metalonly/player/MainActivity.java
Merge correction.
Merged in lippertsjan/metal-only/master (pull request #2)

Conflicts:
	src/com/codingspezis/android/metalonly/player/FavoritesActivity.java
	src/com/codingspezis/android/metalonly/player/LicenseActivity.java
	src/com/codingspezis/android/metalonly/player/MainActivity.java
	src/com/codingspezis/android/metalonly/player/Marquee.java
	src/com/codingspezis/android/metalonly/player/PlayerService.java
	src/com/codingspezis/android/metalonly/player/SongSaver.java
Fixed issue 15; Fixed issue 16
Fixed issue 15; Fixed issue 16
Merge remote-tracking branch 'robert/master' into dev
Merge remote-tracking branch 'robert/develop' into dev
Merge branch 'dev'
added striped background for control buttons, added dividers. fixes #14
Merge branch 'i14-dividers-for-button-bar' into dev
Redesigned Song class and changed affected classes.
Minor improvement in a function for better readability. no recursion anymore.
Merged in lippertsjan/metal-only/i14-dividers-for-button-bar (pull request #5)

Dividers in stream button bar
Removed too complicated datastrucutres in MainActivity and SongAdapter
Merge branch 'refactoring' into dev
First id-unifications, minor layout changes
first attempt on a landscape layout