s
Merge branch 'master' of https://github.com/luoerming/Project

Conflicts:
	JD/src/js/plugin/jquery.bxslider.js