Merged in lollybot server and controller UI code from https://code.google.com/p/lollybot/