Merge remote-tracking branch 'origin/ree-build-resources-allin' into feature.jsrefactor

Conflicts:
	.gitignore
	substanced/sdi/static/dist/slick.grid.upstream.css
	substanced/sdi/static/dist/slickgrid.upstream.js
	substanced/sdi/static/js/slickgrid-config.js
	substanced/sdi/views/templates/contents.pt