as per vince's request
Merge branch 'master' of https://github.com/mgoldber/FoodHack2014

Conflicts:
	grails/demo/grails-app/views/index.gsp