trying to figure out editing
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
added database
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
added database
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/home/consortiaEdit.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/home/consortiaEdit.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

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

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

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

Conflicts:
	Macademia/grails-app/views/home/consortiaEdit.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
pictures.  issue still with flash
pictures.  issue still with flash