commit to merge
Merge branch 'addressMigration' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/grails-app/views/person/test.gsp
Merge branch 'addressMigration' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/web-app/js/lib.macademia.history.js