new_fixes
Merge branch 'master' of https://github.com/LeaguePlayer/web_aijk into newbranch