Changing into a new history api
Merge remote-tracking branch 'origin/addressMigration' into addressMigration

Conflicts:
	Macademia/grails-app/views/person/test.gsp
	Macademia/web-app/js/lib.macademia.history.js