update merge
Merge branch 'master' of https://github.com/xs9627/angular-seed-start