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

Conflicts:
	Macademia/web-app/css/style.css
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/consortium/show.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/consortium/show.gsp