login webservice
Integration V1.2
Testing Scenario1
Merge origin/master

Conflicts:
	CarpoolingBackendFinal/src/java/dao/LocationDAO.java
	CarpoolingBackendFinal/src/java/webservices/EventManagement.java