updated
updated files for user
InnomsAllocationService related files
InnomsEntityRevService related files
Merge branch 'master' of https://github.com/pattamattass/innoms.git

Conflicts:
	innoms-ws/src/main/resources/innomsWSContext.xml
	innoms-ws/src/main/webapp/WEB-INF/beans.xml