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

Conflicts:
	FySe2014/war/WEB-INF/classes/s14338990/S14338990LoginServlet.class
	FySe2014/war/WEB-INF/classes/search/S12103886SearchServlet.class
Merge branch 'master' of https://github.com/fyoshida/FySe2014.git