ymt merge conflict
ymt merge conflict
ymt fix favorites
ymt fix rsolr conflict
Merge branch 'master' of https://github.com/whyvine/xuetang
ymt submit
ymt fix favorite
ymt fix solr bug
remove solr
solr start