deployment setup
Merge branch 'develop' of github.com:StraDIVar/mymarketprices into develop

Conflicts:
	config/nginx.conf