cookies work better
Merge branch 'master' of https://github.com/Brc509/Settlers

Conflicts:
	server/src/catan/server/handler/user/UserLoginHandler_Prod.java
	server/src/catan/server/handler/user/UserRegisterHandler_Prod.java