changed default mysql credentials
Merge remote-tracking branch 'origin/master'
minor changes