Merge branch 'origin/master'
gitignore class, change mysql password, fix url mapping