added the parish, village
Merge branch 'master' of github.com:jmpango/OXM

Conflicts:
	oxm/oxm-web/src/main/webapp/WEB-INF/classes/views.properties
	oxm/oxm-web/src/main/webapp/WEB-INF/tiles-defs.xml
	oxm/oxm-web/src/main/webapp/WEB-INF/views/tiles/menu.jsp
worked on selling place and changing the controlpanel