- removed test statement from EncounterManager::getJSON()
Merge origin/master