Church and Church Org admin - initial commit
Org List
Initial Church editing
Merge remote-tracking branch 'origin/master' into editor_master

Conflicts:
	.gitignore
	src/main/resources/datasource-tx-jpa.xml
Merge branch 'editor_master' of https://github.com/mattrebor/emsiweb.git
into editor_master