fix js conflict in admin
Merge branch 'master' of github.com:cwmb/clanwars