Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/controllers/org/macademia/HomeController.groovy
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/controllers/org/macademia/HomeController.groovy
pictures on consortia's pages
Merge remote-tracking branch 'origin/consortia' into consortia