Merge origin/master

Conflicts:
	jsProject/jsProject.js