json serial
Merge branch 'master' of https://github.com/Hemisphere-Project/HController

Conflicts:
	ModuleManager.js