support engineer UI edited to look like custServiceAdmin
supportEng search imsis by failureclass - Alan & Ciaran
login function almost working
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster

Conflicts:
	RestJPA/src/main/java/com/ericsson/restservice/RestService.java
	RestJPA/src/main/java/com/ericsson/service/IServiceEJB.java
	RestJPA/src/main/java/com/ericsson/service/ServiceEJB.java
working login rest service
working login rest service 2
fixed File Upload. Now file is uploaded to a "relative" path on the
server ( .../standalone/deployments/RestJPA.war/WEB-INF/Upload/)

Signed-off-by: IvanDoe <d12128017@mydit.ie>
Merge remote-tracking branch 'origin/masterMaster' into masterMaster

Conflicts:
	RestJPA/src/main/java/com/ericsson/restservice/RestService.java

Signed-off-by: IvanDoe <d12128017@mydit.ie>
working net eng history rest slice
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster
Ciaran and Alan converting query to REST
Alan and Ciaran converting query to Rest
notification bar moved up
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster
finished history for network eng
finished history for network engmerge
Merge branch 'masterMaster' into ivosBranch

Conflicts:
	RestJPA/src/main/java/com/ericsson/dao/EnquiryDAO.java
	RestJPA/src/main/java/com/ericsson/dao/UeDAO.java
	RestJPA/src/main/java/com/ericsson/entities/Enquiry.java
	RestJPA/src/main/java/com/ericsson/entities/Event.java
	RestJPA/src/main/java/com/ericsson/entities/Ue.java
	RestJPA/src/main/java/com/ericsson/interfaces/IEnquiryDAO.java
	RestJPA/src/main/java/com/ericsson/interfaces/IEventDAO.java
	RestJPA/src/main/java/com/ericsson/restservice/RestService.java
	RestJPA/src/main/java/com/ericsson/service/IServiceEJB.java
	RestJPA/src/main/java/com/ericsson/service/ServiceEJB.java
	RestJPA/src/main/webapp/NetMgmtEng.jsp
	RestJPA/src/main/webapp/login.html

Signed-off-by: IvanDoe <d12128017@mydit.ie>