Merge branches 'dev' and 'master'
Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Adds a docs symlink folder
Adds deploy setup to deploy locally
Adds alternative passwords
Merge branches 'master' and 'dev' into dev