add spring security tag
user module
Merge branch 'master' of
https://github.com/lianzhengkun/easyshopping.git into mylocal

Conflicts:
	src/main/webapp/main.jsp
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping.git into mylocal
ss