Commit to pull
Merge branch 'addressMigration' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/grails-app/conf/ApplicationResources.groovy
	Macademia/web-app/js/lib.macademia.history.js