destroy socket on scope destroy
Merge tag '13' into HEAD

Conflicts:
	browser/js/app-bundle.js
Merge tag '14' into HEAD

Conflicts:
	browser/js/app-bundle.js
Merge tag '15' into HEAD
app bundle