Merge branches 'master' and 'dev' into dev
Changes the password for DB
Merge branches 'dev' and 'master'