Named anonymous constructors
Added one more layer of inheritance in blocks
What What?
Merge branch 'ian'

Conflicts:
	standalone/static/js/splash-class-definitions.js
Merge branch 'oldcode'

Conflicts:
	splash/splash/static/js/splash-class-definitions.js