version stable
x

x
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/opennetwork/wifisync/openwifi/LoginActivity.java
	app/src/main/java/com/opennetwork/wifisync/openwifi/MainActivity.java
	app/src/main/java/com/opennetwork/wifisync/openwifi/db/DBManager.java

	app/src/main/java/com/opennetwork/wifisync/openwifi/misc/OpenWifiApplication.java

	app/src/main/java/com/opennetwork/wifisync/openwifi/misc/WifiListViewAdapter.java
	app/src/main/res/menu/menu_main_activity.xml
	app/src/main/res/values/strings.xml