Rebecca's image fixes part 2
Merge remote-tracking branch 'origin/consortia' into consortia

Conflicts:
	Macademia/grails-app/views/person/show.gsp
Merge remote-tracking branch 'origin/consortia' into consortia

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