meh
Merge branch 'master' of https://github.com/schuschu/SPS2014-RSSI

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