est
Merge branch 'master' of https://github.com/fyoshida/FySe2014.git

Conflicts:
	FySe2014/src/s12108490/S12108490LoginServlet.java
	FySe2014/src/s14337590/S14337590User.java
	FySe2014/src/s14337884/S14337884LoginServlet.java
	FySe2014/test/s14337884/S14337884LoginServletTest.java
Test