Merging
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Conflicts:
	grails-app/controllers/simplicity/HomeController.groovy
	grails-app/views/home/index.gsp