fix
:space_invader: Added .gitattributes
Merge branch 'master' of github.com:bigbag/mobispot-yii
Merge branch 'develop' of github.com:bigbag/mobispot-yii
merge
feature: новый способ подключения акций с проверкой условий в term-flask
merge
Merge branch 'hotfix/loyalty_api'

Conflicts:
	themes/mobispot/css/mobile-add.css
	themes/mobispot/css/style_mobile.min.css