Fixed the public / private keys (for now, these will change before production!) and the salt (again, for now, this too will change before production).
Merge remote-tracking branch 'origin/develop' into develop