Added support for SSL
Merge branch 'ssl-support'

Conflicts:
	Dockerfile