update
Merge branch 'new-style' of github.com:shjie047/angular-mvms into new-style