update
Merge branch 'master' of github.com:fireball-x/newcomer