# Conflicts:
#	src/main/webapp/activation.html
#	src/main/webapp/demo.html
#	src/main/webapp/failure.html
#	src/main/webapp/forget.html
#	src/main/webapp/home1.html
#	src/main/webapp/index.html
#	src/main/webapp/login.html
#	src/main/webapp/olduser.html
#	src/main/webapp/resetpwd.html
#	src/main/webapp/scripts/lgui.js
#	src/main/webapp/success.html