Another commit
Merge branch 'new-architecture' into map-work

Conflicts:
	static/js/ux-views-map2.js
	templates/spatial.html

Merge commit
Merge branch 'new-architecture' into map-work

Conflicts:
	templates/spatial.html

Merge again
Bug fixes for map (resize, widget and ids)
Merge branch 'new-architecture' into map-work

Conflicts:
	static/js/ux-views-map2.js
	templates/spatial.html

Merge commit