Added count of imsis, and duration query

Signed-off-by: john <john@johnVB>
Merge branch 'masterMaster' of
https://john1122@github.com/Rialaado/Grupa4.git into masterMaster

Conflicts:
	RestJPA/src/main/java/com/ericsson/interfaces/IEventDAO.java
	RestJPA/src/main/java/com/ericsson/service/IServiceEJB.java
	RestJPA/src/main/webapp/NetMgmtEng.jsp
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster