update change
Merge branch 'master' of https://github.com/huskycode/thsea.git

Conflicts:
	geb/src/test/groovy/HomeTest.groovy