admin stuff i dont remember
aaaaaaaaaahhhhhhhhhhhhhhhh!!!!!!!!!!1
devdb file cause fuck it
Merge branch 'master' of https://github.com/bbellanc/HeritageTrail

Conflicts:
	devDb.h2.db
	grails-app/controllers/heritagetrail/EntryController.groovy
	target/stacktrace.log