changed images things
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Committing to pull.
Merge remote-tracking branch 'origin/consortia' into consortia

Conflicts:
	Macademia/web-app/css/style.css
person.gsp now has gray labels that turn black on mouseover
Merge remote-tracking branch 'origin/consortia' into consortia