setted up JDBC resources and Pool also added persistence unit
setted up JDBC resources and Pool also added persistence unit
created entities for common infra and OES
created entities for common infra and OES
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties