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