Serving private files with internal
Moving websocket proxy to diff define
Typo
Removing websocket argument
Added private files in ssl vhost
Allow to change location on websocket proxy
We need a higher version of puppetlabs-concat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifests/django.pp
	manifests/proxy.pp