deployment setup - fixes 1
deployment setup - use capistrano v.2.x instead 3.x
deployment setup - fixes 2.1
deployment setup - fixes 2.2
deployment setup - fixes 2.3
deployment setup - fixes 2.4
deployment setup - fixes 2.5
deployment setup - fixes 2.6
deployment setup - fixes 2.7
make unicorn_init.sh executable
Revert "make unicorn_init.sh executable"

This reverts commit 91f3cc51f8544428887d7be2a9af9186583979b0.
make unicorn_init.sh executable
deployment setup - fixes 2.8
deployment setup
Merge branch 'develop' of github.com:StraDIVar/mymarketprices into develop

Conflicts:
	config/nginx.conf
deployment setup - changes, add staging config
Merge remote-tracking branch 'origin/develop' into marionette

Conflicts:
	Gemfile.lock