继续完成
Merge branch 'master' of github.com:linshixiong/AutoTest

Conflicts:
	client/src/com/emdoor/autotest/Commands.java
	client/src/com/emdoor/autotest/MainActivity.java
	client/src/com/emdoor/autotest/Utils.java