Merge branch 'master-copy' into BuldProcessUpdate

Conflicts:
	gulpfile.js
	package.json