crops pages
Merge branch 'master' of https://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
adds all jpa stuff and crop views
Merge branch 'master' of https://github.com/jmpango/OXM