hotfix 1
Merge branch 'hotfix-1' into develop

Conflicts:
	git-tutorial/src/jp/tcmobile/gittutorial/Main.java