Removed underscore shim from requirejs config
Merge branch 'master' into bar-chart

Conflicts:
	src/test1/app.js