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

Conflicts:
	FySe2014/src/s14337590/S14337590LoginServlet.java
Merge branch 'master' of https://github.com/fyoshida/FySe2014.git
1125
Merge branch 'master' of https://github.com/fyoshida/FySe2014.git