capify
capify
Merge branch 'capify' of github.com:BrandyMint/riolis_server

Conflicts:
	Gemfile.lock