issue6
Merge remote-tracking branch 'origin/develop' into issue6

Conflicts:
	githubTestProject/src/test/Hello.java
Merge pull request #8 from gunpei/issue6

issue6