Merge branch 'master' of https://github.com/sibiyellow/Ys.Factory

Conflicts:
	plugins/window/ys.window.js
Merge branch 'master' of https://github.com/sibiyellow/Ys.Factory

Conflicts:
	plugins/window/ys.window.js