Use dojo loader for new sidebar too, to make useBuild work
Merge branch 'master' into rc2

Conflicts:
	js/app/Visualization/BasicSidebar.js