Signed-off-by: steven_chen <steven_chen@thedspway.com>
Merge branch 'extend' of git@github.com:stevenCJC/GraceJS.git into extend

Conflicts:
	src/engine/Engine.js

Signed-off-by: steven_chen <steven_chen@thedspway.com>
Merge branch 'extend' of git@github.com:stevenCJC/GraceJS.git into extend