Conflicts:
	mobile/config.rb
	mobile/sass/base/_mixins.scss
	mobile/sass/base/_sprite.scss
	mobile/sass/base/_variable.scss
	mobile/sass/mobile.scss
	mobile/sass/partial/_404.scss
	mobile/sass/partial/_about.scss
	mobile/sass/partial/_detail.scss
	mobile/sass/partial/_edit.scss
	mobile/sass/partial/_index.scss
	mobile/sass/partial/_magazine.scss
	mobile/sass/partial/_map.scss
	mobile/sass/partial/_other.scss
	mobile/sass/partial/_public.scss
	mobile/sass/partial/_video.scss
	mobile/sass/partial/components/_comment.scss
	mobile/sass/partial/components/_download-app.scss
	mobile/sass/partial/components/_footer.scss
	mobile/sass/partial/components/_header-download-app.scss
	mobile/sass/partial/components/_header-nav.scss
	mobile/sass/partial/components/_header.scss
	mobile/sass/partial/components/_links.scss
	mobile/sass/partial/components/_login.scss
	mobile/sass/partial/components/_page_switch.scss
	mobile/sass/partial/components/_search.scss
	mobile/sass/partial/components/_side-bar.scss
	mobile/sass/partial/components/_tag.scss
	mobile/sass/partial/plugin/_idangerous.swiper.scss
	web/assets/images/followusbackground.png
	web/assets/images/logo.png
	web/assets/images/pager_choosen.png
	web/gulpfile.js
	web/sass/scss/_common.scss
	web/sass/scss/girls.scss
	web/sass/scss/media/_1620_home.scss
	web/sass/scss/media/_whatever_home.scss
	web/sass/scss/plugin/idangerous.swiper.scss