nginx setup
Merge remote-tracking branch 'origin/master'

Conflicts:
	kano_konnect/uwsgi_stage.ini
nginx setup