Salted hash
Loggin
Merge branch 'md5' into develop

Conflicts:
	bot.js