Merge origin/master

Conflicts:
	src/java/Servlets/SingUpServlet.java