0.36
提交class
v7.jar
修改
Merge branch '20140726'

Conflicts:
	.gitignore
	README.md