code reformat
Merge remote-tracking branch 'origin/master'

Conflicts:
	Passenger/AndroidManifest.xml
	Passenger/res/anim/fade.xml
	Passenger/res/anim/hold.xml
	Passenger/res/layout/activity_login.xml
	Passenger/res/layout/activity_main.xml
	Passenger/res/layout/activity_map.xml
	Passenger/res/layout/activity_register.xml
	Passenger/res/menu/main.xml
	Passenger/res/menu/map.xml
	Passenger/res/menu/register.xml
	Passenger/src/org/cug/network/CheckNet.java
	Passenger/src/org/cug/network/NetService.java
	Passenger/src/org/cug/passenger/LoginActivity.java
	Passenger/src/org/cug/passenger/MainActivity.java
	Passenger/src/org/cug/passenger/MapActivity.java
	Passenger/src/org/cug/passenger/RegisterActivity.java
	Passenger/src/org/cug/util/Settings.java
	Passenger/src/org/cug/util/SharedPreferencesTool.java
	Passenger/src/org/cug/util/SysApplication.java
	Passenger/src/org/cug/util/Tools.java