Added MySQL connection details
Merge branch 'master' into bug_2