fixed conflict
adds position  page properties
many commits
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
producer-org
prod org