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

Conflicts:
	Gemfile.lock