remove public/assets
fix
fix ip map bug
Merge branches 'master' and 'beta'