Update package.json to pre
YUI and Loader build for latest Gallery build
Merge branch 'dev-master' into dev-3.x

Conflicts:
	package.json