demo dev
fixed bugs
Merge branch 'master' of github.com:Hy-Android-Team/hermes

Conflicts:
	README.md