merge
Merge branch 'hotfix/loyalty_api'

Conflicts:
	themes/mobispot/css/mobile-add.css
	themes/mobispot/css/style_mobile.min.css
fix
fix
Merge branch 'develop' of github.com:bigbag/mobispot-yii
fix
fix
fix
fix bags
Merge branch 'hotfix/added_wallet_with_remove_card_in_blacklist' into develop