fix the bug
Merge remote-tracking branch 'LOU/master'

Conflicts:
	WebApp/war/WEB-INF/web.xml