bug fix
Merge branch 'master' of github.com:shjie047/angular-mvms2.0