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

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

Conflicts:
	db/development.sqlite3
last com
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/models/event.rb
	db/development.sqlite3