四方达斯蒂芬
add md5
Merge branch 'master' of https://github.com/wzlee/cwlover-web

Conflicts:
	src/main/webapp/app/app/controller/MainController.js
	src/main/webapp/app/app/store/Profile.js
	src/main/webapp/app/app/view/LoginPanel.js
	src/main/webapp/app/app/view/ProfileList.js
	src/main/webapp/app/app/view/Ucenter.js