introduced network location
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/pfeufferweb/android/whereru/ListenActivity.java
	src/de/pfeufferweb/android/whereru/Notifications.java
corrected merge errors