2014-11-04 魏天武  合并
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheOne/src/com/example/theone/activity/MainActivity.java
	TheOne/src/com/example/theone/webaccess/impl/AsyncAccess.java
Merge remote-tracking branch 'origin/master'