merge
Merge branch 'master' of github.com:lyhcode/codecanaan

Conflicts:
	grails-app/views/home/step3.gsp