use mixin instead of merge
Merge branch 'master' of https://github.com/fireball-x/core