update
Merge branch 'master' of https://github.com/mobframe/mobile-front-end-info-collection