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

Conflicts:
	db/development.sqlite3
	log/development.log
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
wins registration
wins registration
Merge branch 'feature-super-new' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/development.sqlite3