review clear
Merge branch 'phase1' of
https://github.com/kawamoto-nihon-protec-co-jp/sampleProj.git into
phase1

Conflicts:
	src/main/webapp/WEB-INF/view/loginHistory/list.jsp