Merge branch 'master' of github.com:TimShier/ProjectStatup

Conflicts:
	grails-app/conf/BootStrap.groovy
Bootstrappin that shit