Merge branch 'master' of github.com:hopeonlus/hope-java

Conflicts:
	README.md
Merge branch 'master' of github.com:hopeonlus/hope-java

Conflicts:
	README.md