Merge branch 'master' into mvvm

# Conflicts:
#	manifest.json
#	src/2d/display/Stage.ts

manifest.json

-{"id":"engine","url":"engine.210e93fc8ecfcb27da00c77582649b96949d28c3.js"}
+{"id":"engine","url":"engine.47eb390007c368d3dc5648734153301ebead724b.js"}
\ No newline at end of file

src/2d/display/Stage.ts

@@ -646,7 +646,6 @@ export class Stage extends Container {
 				let rootDiv = s.rootDiv;
 				let doc = document.documentElement;
 				let box = rootDiv.getBoundingClientRect();//points[o].target
-				console.log(box.y);
 				let left = box.left + window.pageXOffset - doc.clientLeft;
 				let top = box.top + window.pageYOffset - doc.clientTop;
 				cp.x = (points[o].pageX - left) * devicePixelRatio;