merge
merge
Conflicts:
	solr-4.3.0/example/logs/solr.log
merge
quote fixed, basic search
merge
Conflict:
	web/templates/web/content_list.html
modify get_content_in_category and fix bug in submit_content
merge