Дев-версия.
Merge branch 'rails' of https://github.com/jimmyn/webshop into live

Conflicts:
	config/nginx.conf
	config/unicorn_init.sh