Merge branch 'hotfix/store_fix2'
Merge branch 'master' of 188.226.161.18:/home/git/git/mobispot

Conflicts:
	.gitignore
	gulpfile.js_distr
Merge branch 'hotfix/fix_modal_windows'
Merge branch 'develop' of 188.226.161.18:/home/git/git/mobispot
Merge branch 'master' of 188.226.161.18:/home/git/git/mobispot
fix style
fix: gulp config file, fixed style
fix: added angular controller in gulp script
fix: edit mobile template
fix: update gulp config file
Merge branch 'hotfix/fix_angular_controller'
Merge branch 'hotfix/fix_angular_controller' into develop
Merge branch 'develop' of 188.226.161.18:/home/git/git/mobispot
style магазин в новой верстке
Merge branch 'hotfix/messages2'
Merge branch 'hotfix/messages2' into develop
Merge branch 'develop' of 188.226.161.18:/home/git/git/mobispot into develop

Conflicts:
	themes/mobispot/css/all.min.css
	themes/mobispot/views/layouts/block/head/all.php
Merge branch 'master' of 188.226.161.18:/home/git/git/mobispot

Conflicts:
	themes/mobispot/css/all.min.css
	themes/mobispot/views/layouts/block/head/all.php
feature новая всплывайка в демо-китах
fix: theme images