Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/supr/blog/controller/SearchController.java
	src/main/java/com/supr/blog/service/impl/SearchServiceImpl.java
	src/main/java/com/supr/blog/solr/SolrUtil.java
	src/main/webapp/WEB-INF/blog/product.jsp
d