zh-1
Merge branch 'master' of github.com:zhuheng/beyondsoft

Conflicts:
	bin/com/test/main/Main.class
	src/com/test/main/Main.java