Location added
Merge branch 'Location'

Conflicts:
	src/test/java/se/ryttargardskyrkan/rosette/integration/AbstractIntegrationTest.groovy