asdasd
Merge branch 'master' of https://github.com/guzno/WifiListWidget

Conflicts:
	src/se/magnulund/android/wifilistwidget/MainActivity.java