Generate the salt used for hashing user passwords individually for each server instance
Merge branch 'master' into devel

Conflicts:
	src/octoprint/server/api/__init__.py