2014 11 27 17 39
Merge branch 'master' of https://github.com/fyoshida/FySe2014

Conflicts:
	FySe2014/war/login/S12106289Login.jsp