Merge branch 'fix/start-tunnel' into develop
Fix display bug with administrative VPS controls
Handle JSON errors in slave responses properly
Merge branch 'fix/node-admin' into feature/terminate-vps