worked on the entity detected exception
Merge branch 'master' of github.com:jmpango/OXM

Conflicts:
	oxm/oxm-web/src/main/webapp/WEB-INF/classes/views.properties