Added support for tls connections
Merge branch 'develop' into feature/grunt-integration