update
Merge branch 'master' of https://github.com/loslch/WiFi-Zombie

Conflicts:
	src/com/fragments/OutdoorSurveyFragment.java
Merge branch 'master' of https://github.com/loslch/WiFi-Zombie