init3
Merge branch 'master' of git@github.com:felixzhangxd/solr.git

Conflicts:
	doc/schema.sql
	solr/conf/item/data-config.xml
	solr/conf/item/schema.xml
	src/test/java/com/mmall/solr/dao/ItemDaoTest.java
	src/test/java/com/mmall/solr/dao/ShopDaoTest.java