test
Removed intellij configuration files.
Added gitignores.
mostly fixed resizing
Tried to fix address plugin
Merge branch 'consortia' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/web-app/js/lib.macademia.js
Merge branch 'consortia' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/web-app/js/lib.macademia.js
Created the test page
starting new address tests
Merge remote-tracking branch 'origin/addressMigration' into addressMigration
attempting to utilize history.js
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
re-added other history lib
commit to merge
Merge branch 'addressMigration' of https://github.com/shilad/macademia into addressMigration

Conflicts:
	Macademia/grails-app/views/person/test.gsp
FIXED AND WORKING
removed old files
lib.macademia.history.js functions are all working
Merge branch 'addressMigration' of https://github.com/shilad/macademia into addressMigration

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