20140709
Merge branch 'master' of https://github.com/galaxybing/g1