fixed a really urgent issue
did some work on request.getParameter
Merge branch 'master' into request.getParameter
Added comment from master 'new branch...'

Conflicts:
	src/main/java/gedo/HS/web/LoginController.java
	target/classes/gedo/HS/web/LoginController.class
request.getParameter after merge of master and hotfix