update controller
Merge branch 'master' of https://github.com/aceyin/seeko

Conflicts:
	web/grails-app/controllers/org/seeko/HomeController.groovy
	web/grails-app/controllers/org/seeko/UserController.groovy