ticket:00 Merge branch 'master' into staging
ticket:00 clean up
ticket:00 Another clean up
ticket:87 Broght back good old user&pass for db
ticket:87 Merge branch 'staging'