Delete, removed ssl fixed #4
Merge branch 'master' into RelationAndSOP

Conflicts:
	launch/src/main/resources/application.conf