Merge remote-tracking branch 'origin/master'

Conflicts:
	AndStu/AndroidManifest.xml
	AndStu/bin/classes/com/example/andstu/R$id.class
	AndStu/bin/classes/com/example/andstu/R$layout.class
	AndStu/bin/classes/com/example/andstu/R$menu.class
	AndStu/bin/classes/com/example/andstu/R$string.class
	AndStu/bin/classes/com/example/andstu/R$style.class
	AndStu/gen/com/example/andstu/R.java
	AndStu/res/layout/netmanager_activity.xml
	AndStu/src/com/example/andstu/net/netmanager/NetManagerActivity.java
Merge branch 'master' of https://github.com/hjin1987/andstu.git