Merge branch 'master' of https://github.com/Krill221/RioCard

Conflicts:
	Gemfile
	Gemfile.lock
mm
Merge branch 'master' of https://github.com/Krill221/RioCard

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
Merge branch 'develop'
fix bugs
Merge branch 'develop'
fix bugs
fix bugs
fix bugs
fix bugs
fix bugs
Merge branch 'master' into develop