Fix scope redeclaration
Fixup trailing whitespace
Merge branch 'extsdk'

Conflicts:
	bootstrap.js