Merge branches 'master' and 'dev'
Adds the final good symbolic link for docs
Changes the deploy user, password and folder settings
Merge branches 'master' and 'dev' into dev