ff
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop

Conflicts:
	Gemfile.lock
fix 3
Merge branch 'feature-sms-text'
fix 4
Merge branch 'master' into feature-sms-text
add common info to stat
Merge branch 'feature-sms-text' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop'
bugs fix and shop design
charts in stat
Merge branch 'feature-sms-text' into develop
Merge branch 'feature-charts' into develop
Merge remote-tracking branch 'origin/develop' into develop
f z
Merge remote-tracking branch 'origin/develop' into develop
thanks gods all work!
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'