Conflicts:
library/Api/Yohobuy.php
library/Plugin/TemplateLayout.php
static/js/category/brand.js
static/js/category/index.js
static/js/home/home.js
static/js/index/channel.js
static/sass/category/_index.scss
template/m.yohobuy.com/actions/index/index/index.phtml
template/m.yohobuy.com/partials/layout/page_header.phtml
template/m.yohobuy.com/partials/layout/use.phtml
yohobuy/m.yohobuy.com/configs/application.developer.ini
yohobuy/m.yohobuy.com/configs/application.preview.ini
yohobuy/m.yohobuy.com/configs/application.production.ini
yohobuy/m.yohobuy.com/configs/application.testing.ini
