delete salt-key at install_salt.sh
Merge remote-tracking branch 'origin/master'