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:
	.gitignore
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop

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

Conflicts:
	app/views/clients/add_summ.html.erb
	db/schema.rb
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop

Conflicts:
	.gitignore
new add summ