added changes from json branch
added json branch server stuff
Merge branch 'master' of https://github.com/BrainComputationLab/ncb