Merge branch 'master' of https://github.com/ramonchu/grooweb.git

Conflicts:
	src/main/webapp/WEB-INF/groovy/conf/Mappings.groovy
	src/main/webapp/WEB-INF/groovy/controller/BasicController.groovy
	src/main/webapp/WEB-INF/jsp/index.jsp
Merge branch 'master' of https://github.com/ramonchu/grooweb.git