well w/e
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/at/schuschu/android/rssilogger/LoggerMain.java
merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/at/schuschu/android/rssilogger/LoggerMain.java