Merge branch 'master' of git@github.com:MartinBonnie/BMW.git

Conflicts:
	WebContent/user/account.jsp
	WebContent/user/addMessage.html
	WebContent/user/addProduct.html
	WebContent/user/album.html
1
Merge branch 'master' of git@github.com:MartinBonnie/BMW.git
添加百度编辑器