Signed-off-by: IvanDoe <d12128017@mydit.ie>
Merge branch 'masterMaster' into masterMasterTomerge

Conflicts:
	RestJPA/src/main/java/com/ericsson/dao/AccountDAO.java
	RestJPA/src/main/java/com/ericsson/dao/CellHierDAO.java
	RestJPA/src/main/java/com/ericsson/dao/EventDAO.java
	RestJPA/src/main/java/com/ericsson/interfaces/IAccountDAO.java
	RestJPA/src/main/java/com/ericsson/restservice/RestService.java
clean ivosBranch