Adding new server cert and dummy user cert.
Adding user.p12 instructions in readme file.
Merge branch 'develop' of https://github.com/ozone-development/meridian into newFeature/24/genericUserCerts

Conflicts:
	server/certs/localhost.p12
Added missing cert password instructions to the readme file.
Merge branch 'develop' of https://github.com/ozone-development/meridian into newFeature/24/genericUserCerts
Added password to the user.p12 certificate.
Merge pull request #51 from ozone-development/newFeature/24/genericUserCerts

newFeature/24/genericUserCerts
Merge branch 'develop' of github.com:ozone-development/meridian into research/new-rendering-engine-api

* 'develop' of github.com:ozone-development/meridian:
  Added password to the user.p12 certificate.
  Added missing cert password instructions to the readme file.
  Adding user.p12 instructions in readme file.
  Adding new server cert and dummy user cert.