login + error
Merge branch 'master' of https://github.com/WulmvE/Dryves

Conflicts:
	DryvesV2/src/java/controller/SearchRideServlet.java