conflict testServer.js
Merge branch 'master' of https://github.com/vicci/360Vicci
Merge branch 'master' of https://github.com/vicci/360Vicci
Merge branch 'master' of https://github.com/vicci/360Vicci
Merge branch 'master' of https://github.com/vicci/360Vicci
Merge branch 'master' of https://github.com/vicci/360Vicci
latest node server update