pictures...finally
Merge remote-tracking branch 'origin/consortia' into consortia

Conflicts:
	Macademia/grails-app/controllers/org/macademia/HomeController.groovy