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

Conflicts:
	FySe2014/src/s14337786/S14337786LoginServlet.java
Merge branch 'master' of https://github.com/fyoshida/FySe2014
Merge branch 'master' of https://github.com/fyoshida/FySe2014
Merge branch 'master' of https://github.com/fyoshida/FySe2014
20141125