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

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/develop' into develop