fix
Merge branch 'master' of github.com:rhzk/app-deployment-server

Conflicts:
	assets/ca_cert.pem
	assets/ca_private.pem
	assets/ra_cert.pem
	assets/ra_private.pem
	assets/ssl_cert.pem
	assets/ssl_private.pem