DESC:修改登录页面UI
TIME:2013年9月9日16:57:05
USER:LUOJ
Merge branch 'master' of https://github.com/yueying0083/TeaShopServer

Conflicts:
	src/main/resources/applicationContext.xml