wq
Merge branch 'master' of https://github.com/sui-bian/Web

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/sui-bian/Web

Conflicts:
	.idea/workspace.xml
	src/main/webapp/WEB-INF/jsp/detail.jsp
	src/main/webapp/js/bootstrap-rating-input.js