commit to pull
commit to pull
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Interest Layout is functional and will become prettier soon!
Merge remote-tracking branch 'origin/consortia' into consortia

Conflicts:
	Macademia/grails-app/conf/ApplicationResources.groovy
	Macademia/web-app/js/d3test/interest-layout.js
Resolved conflict.
Resolved conflict.