add loginUtil loginFilter
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/resources/struts/struts.xml
	src/main/webapp/WEB-INF/web.xml