working on resizing
Merge remote-tracking branch 'origin/consortia' into consortia

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