d
littl change
forget
don't know
revise
revise
Merge branch 'master' of github.com:liuxun349/as-ht

Conflicts:
	src/com/asht/AsHt.java
	src/com/asht/controller/AppStart.java
	src/com/asht/model/UserInfo.java