Merge branch 'master' of https://github.com/KernelCorp/sneg

Conflicts:
	Gemfile.lock
Add features for delivery

Merge branch 'master' of https://github.com/KernelCorp/sneg

Conflicts:
	Gemfile.lock
Add features for delivery

Merge branch 'master' of https://github.com/KernelCorp/sneg

Conflicts:
	Gemfile.lock