first commit
Merge branch 'master' of https://github.com/LiZhiAuto/LiZhiAuto.git

Conflicts:
	src/com/cvte/lizhi/Constant.java
	src/com/cvte/lizhi/test.java