SolrとTomcatの.confを書き換え
Merge branch 'master' of github.com:pacsolution/sakura

Conflicts:
	search/tomcat/conf/tomcat-users.xml
	search/tomcat/solr/solr.xml