WIP file list
Merge branch 'Socket_Interfacing' into ui

Conflicts:
	extensions/sockets/handler.js