Project GenerateAll and Bootstrap mods
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/startupfunnel/app/StageController.groovy
	grails-app/views/stage/_form.gsp
	grails-app/views/stage/list.gsp
	grails-app/views/stage/show.gsp