Index: config/container.php
===================================================================
--- config/container.php	(revision 683253)
+++ config/container.php	(working copy)
@@ -72,7 +72,8 @@
 	// The OAuth SSL certificates to use, and the pass phrase for the private key  
 	'private_key_file' => realpath(dirname(__FILE__) . '/../certs').'/private.key', 
 	'public_key_file' => realpath(dirname(__FILE__) . '/../certs').'/public.crt', 
-	'private_key_phrase' => 'partuza', 
+	'private_key_phrase' => 'partuza', 
+	'jsondb_path' => realpath(dirname(__FILE__) . '/../../javascript/sampledata').'/canonicaldb.json',
 
 	// Force these libraries to be external (included through <script src="..."> tags), this way they could be cached by the browser
 	'focedJsLibs' => '', 
@@ -87,9 +88,9 @@
 	// Old-style wire format data handler, this is being depreciated 
 	'handlers' => '',
 	// New RESTful API data service classes to use
-	'people_service' => 'BasicPeopleService',
-	'activity_service' => 'BasicActivitiesService',
-	'app_data_service' => 'BasicAppDataService',
+	'people_service' => 'JsonDbOpensocialService',
+	'activity_service' => 'JsonDbOpensocialService',
+	'app_data_service' => 'JsonDbOpensocialService',
 	'messages_service' => 'BasicMessagesService',
 	// Also scan these directories when looking for <Class>.php files. You can include multiple paths by seperating them with a , 
 	'extension_class_paths' => '',
Index: src/social-api/http/RestServlet.php
===================================================================
--- src/social-api/http/RestServlet.php	(revision 683253)
+++ src/social-api/http/RestServlet.php	(working copy)
@@ -52,7 +52,8 @@
 require 'src/social-api/converters/OutputJsonConverter.php';
 require 'src/social-api/converters/InputConverter.php';
 require 'src/social-api/converters/InputAtomConverter.php';
-require 'src/social-api/converters/InputJsonConverter.php';
+require 'src/social-api/converters/InputJsonConverter.php';
+require 'src/social-api/canonical/JsonDbOpensocialService.php';
 
 class RestException extends Exception {}
 
Index: src/social-api/samplecontainer/BasicAppDataService.php
===================================================================
--- src/social-api/samplecontainer/BasicAppDataService.php	(revision 683253)
+++ src/social-api/samplecontainer/BasicAppDataService.php	(working copy)
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-class BasicAppDataService extends AppDataService {
+class BasicAppDataService implements AppDataService {
 
 	public function deletePersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token)
 	{
Index: src/social-api/samplecontainer/BasicActivitiesService.php
===================================================================
--- src/social-api/samplecontainer/BasicActivitiesService.php	(revision 683253)
+++ src/social-api/samplecontainer/BasicActivitiesService.php	(working copy)
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-class BasicActivitiesService extends ActivitiesService {
+class BasicActivitiesService implements ActivitiesService {
 
 	public function getActivity(UserId $userId, $groupId, $activityId, $first, $max, SecurityToken $token)
 	{
Index: src/social-api/samplecontainer/BasicPeopleService.php
===================================================================
--- src/social-api/samplecontainer/BasicPeopleService.php	(revision 683253)
+++ src/social-api/samplecontainer/BasicPeopleService.php	(working copy)
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-class BasicPeopleService extends PeopleService {
+class BasicPeopleService implements PeopleService {
 
 	private function comparator($person, $person1)
 	{
Index: src/social-api/canonical/JsonDbOpensocialService.php
===================================================================
--- src/social-api/canonical/JsonDbOpensocialService.php	(revision 0)
+++ src/social-api/canonical/JsonDbOpensocialService.php	(revision 0)
@@ -0,0 +1,409 @@
+<?
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Implementation of supported services backed by a JSON DB
+ */
+class JsonDbOpensocialService implements ActivitiesService, PeopleService, AppDataService {
+
+	private function comparator($person, $person1) {
+		$name = $person['name']['unstructured'];
+		$name1 = $person1['name']['unstructured'];
+		if ($name == $name1) {
+			return 0;
+		}
+		return ($name < $name1) ? - 1 : 1;
+	}
+
+	/**
+	 * The DB
+	 */
+	private $db;
+
+	/**
+	 * The JSON<->Bean converter
+	 */
+	private $converter;
+
+	/**
+	 * db["activities"] -> Array<Person>
+	 */
+	private static $PEOPLE_TABLE = "people";
+
+	/**
+	 * db["people"] -> Map<Person.Id, Array<Activity>>
+	 */
+	private static $ACTIVITIES_TABLE = "activities";
+
+	/**
+	 * db["data"] -> Map<Person.Id, Map<String, String>>
+	 */
+	private static $DATA_TABLE = "data";
+
+	/**
+	 * db["friendLinks"] -> Map<Person.Id, Array<Person.Id>>
+	 */
+	private static $FRIEND_LINK_TABLE = "friendLinks";
+	
+	private $allPeople;
+	
+	private $allData;
+	
+	private $allActivities;
+
+	private $jsonDbFileName = 'ShindigDb.json';
+	
+	public function __construct() {	}
+
+	public function getDb() {
+		try {
+			$fileName = sys_get_temp_dir() . $this->jsonDbFileName;
+			if (file_exists($fileName)) {
+				$cachedDb = file_get_contents($fileName);
+				return json_decode($cachedDb, true);
+			} else {
+				$jsonDb = Config::get('jsondb_path');
+				$dbConfig = file_get_contents($jsonDb);
+				$contents = preg_replace('/[^http:\/\/|^https:\/\/]\/\/.*$/m', '', preg_replace('@/\\*(?:.|[\\n\\r])*?\\*/@', '', $dbConfig));
+				$jsonDecoded = json_decode($contents, true);
+				$this->saveDb($jsonDecoded);
+				return $jsonDecoded;
+			}
+		} catch (Exception $e) {
+			throw new Exception("An error occured while reading/writing the json db: " . $e);			
+		}
+	}
+
+	private function saveDb($db) {
+		$handle = fopen(sys_get_temp_dir() . $this->jsonDbFileName, "w+");
+		fwrite($handle, json_encode($db));
+		fclose($handle);
+	}
+
+	/**
+	 * Get the set of user id's from a user and group
+	 */
+	private function getIdSet(UserId $user, $group, SecurityToken $token) {
+		$userId = $user->getUserId($token);
+		if ($group == null) {
+			return array($userId);
+		}
+		$returnVal = array();
+		switch ($group->getType()) {
+			case 'all':
+			case 'friends':
+			case 'groupId':
+				$db = $this->getDb();
+				$friendsLinkTable = $db[self::$FRIEND_LINK_TABLE];
+				if (isset($friendsLinkTable[$userId])) {
+					$friends = $friendsLinkTable[$userId];
+					foreach ($friends as $friend) {
+						$returnVal[$friend['id']] = $friend;
+					}
+				}
+				break;
+			case 'self':
+				$returnVal[$userId] = $userId;
+				break;
+		}
+		return $returnVal;
+	}
+	
+	private function getAllPeople() {
+		if (!isset($this->allPeople)) {
+			$db = $this->getDb();
+			$peopleTable = $db[self::$PEOPLE_TABLE];
+			foreach ($peopleTable as $people) {
+				$this->allPeople[$people['id']] = $people;
+			}
+			$db[self::$PEOPLE_TABLE] = $this->allPeople;
+			$this->saveDb($db); 
+		}
+		return $this->allPeople;
+	}
+	
+	private function getAllData() {
+		if (!isset($this->allData)) {
+			$db = $this->getDb();
+			$dataTable = $db[self::$DATA_TABLE];
+			foreach ($dataTable as $key => $value) {
+				$this->allData[$key] = $value;
+			}
+			$db[self::$DATA_TABLE] = $this->allData; 
+			$this->saveDb($db);
+		}
+		return $this->allData;
+	}
+	
+	private function getAllActivities() {
+		if (!isset($this->allActivities)) {
+			$db = $this->getDb();
+			$activitiesTable = $db[self::$ACTIVITIES_TABLE];
+			foreach ($activitiesTable as $key => $value) {
+				$this->allActivities[$key] = $value;
+			}
+			$db[self::$ACTIVITIES_TABLE] = $this->allActivities;
+			$this->saveDb($db);
+		}
+		return $this->allActivities;
+	}
+	
+	private function getPeopleWithApp($appId) {
+		$peopleWithApp = array();
+		$allPeople = $this->getAllPeople();
+		foreach ($allPeople as $people) {
+			if ($people['hasApp'] == 1) {
+				$peopleWithApp = $people['id'];
+			}
+		}
+		return $peopleWithApp;
+	}
+
+	public function getPerson($userId, $groupId, $profileDetails, SecurityToken $token) {
+		$person = $this->getPeople($userId, $groupId, null, null, null, null, $profileDetails, null, $token);
+		// return of getPeople is a ResponseItem(RestfulCollection(ArrayOfPeople)), disassemble to return just one person
+		$person = $person->getResponse()->getEntry();
+		if (is_array($person) && count($person) == 1) {
+			return new ResponseItem(null, null, $person[0]);
+		}
+		return new ResponseItem(NOT_FOUND, "Person not found", null);
+	}
+	
+	public function getPeople($userId, $groupId, $sortOrder, $filter, $first, $max, $profileDetails, $networkDistance, SecurityToken $token) {
+		$db = $this->getDb();
+		$peopleTable = $this->getAllPeople();
+		$friendsTable = $db[self::$FRIEND_LINK_TABLE];
+		$ids = array();
+		$group = is_object($groupId) ? $groupId->getType() : '';
+		switch ($group) {
+			case 'all':
+			case 'friends':
+				if (is_array($friendsTable) && count($friendsTable) && isset($friendsTable[$userId->getUserId($token)])) {
+					$ids = $friendsTable[$userId->getUserId($token)];
+				}
+				break;
+			case 'self':
+			default:
+				$ids[] = $userId->getUserId($token);
+				break;
+		}
+		$allPeople = $this->getAllPeople();
+		if (! $token->isAnonymous() && $filter == "hasApp") {
+			$appId = $token->getAppId();
+			$peopleWithApp = $this->getPeopleWithApp($appId);
+		}
+		$people = array();
+		foreach ($ids as $id) {
+			if ($filter == "hasApp" && ! in_array($id, $peopleWithApp)) {
+				continue;
+			}
+			$person = null;
+			if (is_array($allPeople) && isset($allPeople[$id])) {
+				$person = $allPeople[$id];
+				if (! $token->isAnonymous() && $id == $token->getViewerId()) {
+					$person['isViewer'] = true;
+				}
+				if (! $token->isAnonymous() && $id == $token->getOwnerId()) {
+					$person['isOwner'] = true;
+				}
+				if (is_array($profileDetails) && count($profileDetails) && ! in_array('all', $profileDetails)) {
+					$newPerson = array();
+					$newPerson['isOwner'] = isset($person['isOwner']) ? $person['isOwner'] : false;
+					$newPerson['isViewer'] = isset($person['isViewer']) ? $person['isViewer'] : false;
+					$newPerson['name'] = $person['name'];
+					foreach ($profileDetails as $field) {
+						if (isset($person[$field]) && ! isset($newPerson[$field])) {
+							$newPerson[$field] = $person[$field];
+						}
+					}
+					$person = $newPerson;
+				}
+				$people[] = $person;
+			}
+		}
+		if ($sortOrder == 'name') {
+			usort($people, array($this, 'comparator'));
+		}
+		//TODO: The samplecontainer doesn't support any filters yet. We should fix this.
+		$totalSize = count($people);
+		$last = $first + $max;
+		$last = min($last, $totalSize);
+		if ($first !== false && $first != null && $last) {
+			$people = array_slice($people, $first, $last);
+		}
+		$collection = new RestfulCollection($people, $first, $totalSize);
+		return new ResponseItem(null, null, $collection);
+	}
+	
+	public function getPersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token) {
+		$db = $this->getDb();
+		$allData = $this->getAllData();
+		$friendsTable = $db[self::$FRIEND_LINK_TABLE];
+		
+		$data = array();
+		$ids = array();
+		switch($groupId->getType()) {
+			case 'self':
+				$ids[] = $userId->getUserId($token);
+				break;
+			case 'all':
+			case 'friends':
+				if (is_array($friendsTable) && count($friendsTable) && isset($friendsTable[$userId->getUserId($token)])) {
+					$ids = $friendsTable[$userId->getUserId($token)];
+				}
+				break;
+			default:
+				return new ResponseItem(NOT_IMPLEMENTED, "We don't support fetching data in batches yet", null);		
+				break;
+		}
+		foreach ($ids as $id) {
+			if (isset($allData[$id])) {
+				$allPersonData = $allData[$id];
+				$personData = array();
+				foreach (array_keys($allPersonData) as $key) {
+					if (in_array($key, $fields) || $fields[0] == "*") {
+						$personData[$key] = $allPersonData[$key];
+					}
+				}
+				$data[$id] = $personData;
+			}
+		}
+		return new ResponseItem(null, null, RestFulCollection::createFromEntry($data));
+	}
+	
+	public function updatePersonData(UserID $userId, GroupId $groupId, $fields, $values, $appId, SecurityToken $token) {
+		$db = $this->getDb();
+		foreach ($fields as $key) {
+			if (! $this->isValidKey($key)) {
+				return new ResponseItem(BAD_REQUEST, "The person app data key had invalid characters", null);
+			}			
+		}
+		switch($groupId->getType()) {
+			case 'self':
+				foreach ($fields as $key) {
+					$value = isset($values[$key]) ? @$values[$key] : null;
+					$allData = $this->getAllData();
+					$person = $allData[$userId->getUserId($token)];
+					$person[$key] = $value;
+					$allData[$userId->getUserId($token)] = $person;
+					$db[self::$DATA_TABLE] = $allData;
+					$this->saveDb($db);
+				}
+				break;
+			default:
+				return new ResponseItem(NOT_IMPLEMENTED, "We don't support updating data in batches yet", null);		
+				break;
+		}
+		return new ResponseItem(null, null, array());
+	}
+	
+	public function deletePersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token) {
+		foreach ($fields as $key) {
+			if (! $this->isValidKey($key)) {
+				return new ResponseItem(BAD_REQUEST, "The person app data key had invalid characters", null);
+			}
+		}
+		switch($groupId->getType()) {
+			case 'self':
+				foreach ($fields as $key) {
+					//TODO: Implement this!!!	
+				}
+				break;
+			default:
+				return new ResponseItem(NOT_IMPLEMENTED, "We don't support deleting data in batches yet", null);		
+				break;
+		}
+		return new ResponseItem(null, null, array());
+	}
+	
+	public function getActivities(UserId $userId, $groupId, $first, $max, SecurityToken $token) {
+		$db = $this->getDb();
+		$friendsTable = $db[self::$FRIEND_LINK_TABLE];
+		$ids = array();
+		switch ($groupId->getType()) {
+			case 'all':
+			case 'friends':
+				if (is_array($friendsTable) && count($friendsTable) && isset($friendsTable[$userId->getUserId($token)])) {
+					$ids = $friendsTable[$userId->getUserId($token)];
+				}
+				break;
+			case 'self':
+        		$ids[] = $userId->getUserId($token);
+        		break;
+    	}
+		$allActivities = $this->getAllActivities();
+		$activities = array();
+		foreach ($ids as $id) {
+			if (isset($allActivities[$id])) {
+				//FIXME return one big collection with the activities mixed, atleast thats what i think the spec suggests :)
+				$activities = array_merge($activities, $allActivities[$id]);
+			}
+		}
+		// TODO: Sort them
+		return new ResponseItem(null, null, RestfulCollection::createFromEntry($activities));
+	}
+	
+	public function createActivity(UserId $userId, $activity, SecurityToken $token) {
+		$db = $this->getDb();
+		$activitiesTable = $this->getAllActivities();
+		$activity['appId'] = $token->getAppId();
+		array_push($activitiesTable[$userId->getUserId($token)], $activity);
+		$db[self::$ACTIVITIES_TABLE] = $activitiesTable;
+		$this->saveDb($db);
+		return new ResponseItem(null, null, array());
+	}
+	
+	public function getActivity(UserId $userId, $groupId, $activityId, $first, $max, SecurityToken $token) {
+		$activities = $this->getActivities($userId, $groupId, $token);
+		$activities = $activities->getResponse();
+		if ($activities instanceof RestFulCollection) {
+			$activities = $activities->getEntry();
+			foreach ($activities as $activity) {
+				if ($activity->getId() == $activityId) {
+					return new ResponseItem(null, null, $activity);
+				}
+			}
+		}
+		return new ResponseItem(NOT_FOUND, "Activity not found", null);
+	}
+	
+	/**
+	 * Determines whether the input is a valid key. Valid keys match the regular
+	 * expression [\w\-\.]+. The logic is not done using java.util.regex.* as
+	 * that is 20X slower.
+	 *
+	 * @param key the key to validate.
+	 * @return true if the key is a valid appdata key, false otherwise.
+	 */
+	public static function isValidKey($key) {
+		if (empty($key)) {
+			return false;
+		}
+		for ($i = 0; $i < strlen($key); ++ $i) {
+			$c = substr($key, $i, 1);
+			if (($c >= 'a' && $c <= 'z') || ($c >= 'A' && $c <= 'Z') || ($c >= '0' && $c <= '9') || ($c == '-') || ($c == '_') || ($c == '.')) {
+				continue;
+			}
+			return false;
+		}
+		return true;
+	}
+
+}
\ No newline at end of file
Index: src/social-api/dataservice/AppDataService.php
===================================================================
--- src/social-api/dataservice/AppDataService.php	(revision 683253)
+++ src/social-api/dataservice/AppDataService.php	(working copy)
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-abstract class AppDataService {
+interface AppDataService {
 
 	/**
 	 * Fetch data for a list of ids.
@@ -28,9 +28,9 @@
 	 * @return ResponseItem a response item with the error code set if
 	 *     there was a problem
 	 */
-	abstract public function getPersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token);
+	function getPersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token);
 
-	abstract public function deletePersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token);
+	function deletePersonData(UserId $userId, GroupId $groupId, $fields, $appId, SecurityToken $token);
 
 	/**
 	 * Updates the data key for the given person with the new value.
@@ -42,5 +42,5 @@
 	 * @return ResponseItem a response item with the error code set if
 	 *     there was a problem
 	 */
-	abstract public function updatePersonData(UserID $userId, GroupId $groupId, $fields, $values, $appId, SecurityToken $token);
+	function updatePersonData(UserID $userId, GroupId $groupId, $fields, $values, $appId, SecurityToken $token);
 }
Index: src/social-api/dataservice/ActivitiesService.php
===================================================================
--- src/social-api/dataservice/ActivitiesService.php	(revision 683253)
+++ src/social-api/dataservice/ActivitiesService.php	(working copy)
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-abstract class ActivitiesService {
+interface ActivitiesService {
 
 	/**
 	 * Returns a list of activities that correspond to the passed in person ids.
@@ -25,9 +25,9 @@
 	 * @param token A valid SecurityToken
 	 * @return a response item with the list of activities.
 	 */
-	abstract public function getActivities(UserId $userId, $groupId, $first, $max, SecurityToken $token);
+	function getActivities(UserId $userId, $groupId, $first, $max, SecurityToken $token);
 
-	abstract public function getActivity(UserId $userId, $groupId, $activityId, $first, $max, SecurityToken $token);
+	function getActivity(UserId $userId, $groupId, $activityId, $first, $max, SecurityToken $token);
 
 	/**
 	 * Creates the passed in activity for the given user. Once createActivity is
@@ -37,5 +37,5 @@
 	 * @param token A valid SecurityToken
 	 * @return a response item containing any errors
 	 */
-	abstract public function createActivity(UserId $userId, $activity, SecurityToken $token);
+	function createActivity(UserId $userId, $activity, SecurityToken $token);
 }
Index: src/social-api/dataservice/PeopleService.php
===================================================================
--- src/social-api/dataservice/PeopleService.php	(revision 683253)
+++ src/social-api/dataservice/PeopleService.php	(working copy)
@@ -17,10 +17,8 @@
  * specific language governing permissions and limitations under the License.
  */
 
-abstract class PeopleService {
-	public static $sortOrder = array('topFriends', 'name');
-	public static $filterType = array('all', 'hasApp', 'topFriends');
-
+interface PeopleService {
+
 	/**
 	 * Returns a Person object for person with $id or false on not found
 	 *
@@ -28,7 +26,7 @@
 	 * @param profileDetails the details to return
 	 * @param security token $token
 	 */
-	abstract public function getPerson($userId, $groupId, $profileDetails, SecurityToken $token);
+	function getPerson($userId, $groupId, $profileDetails, SecurityToken $token);
 
 	/**
 	 * Returns a list of people that correspond to the passed in person ids.
@@ -40,5 +38,10 @@
 	 * @param max The max number of people to fetch.
 	 * @return a list of people.
 	 */
-	abstract public function getPeople($userId, $groupId, $sortOrder, $filter, $first, $max, $profileDetails, $networkDistance, SecurityToken $token);
+	function getPeople($userId, $groupId, $sortOrder, $filter, $first, $max, $profileDetails, $networkDistance, SecurityToken $token);
 }
+
+class PeopleOptions {
+	public static $sortOrder = array('topFriends', 'name');
+	public static $filterType = array('all', 'hasApp', 'topFriends');
+}
\ No newline at end of file
Index: src/social-api/dataservice/RestRequestItem.php
===================================================================
--- src/social-api/dataservice/RestRequestItem.php	(revision 683253)
+++ src/social-api/dataservice/RestRequestItem.php	(working copy)
@@ -162,7 +162,7 @@
 		if (! empty($this->parameters[self::$ORDER_BY])) {
 			return $this->parameters[self::$ORDER_BY];
 		} else {
-			return PeopleService::$sortOrder;
+			return PeopleOptions::$sortOrder;
 		}
 	}
 
@@ -180,7 +180,7 @@
 		if (! empty($this->parameters[self::$FILTER_BY])) {
 			return $this->parameters[self::$FILTER_BY];
 		} else {
-			return PeopleService::$filterType;
+			return PeopleOptions::$filterType;
 		}
 	}
 
Index: canonicaldb.json
===================================================================
--- canonicaldb.json	(revision 683253)
+++ canonicaldb.json	(working copy)
@@ -1,3 +1,4 @@
+
 //  WARNING! Changing this file will affect unit-tests
 //  A canonical JSON backed DB of OpenSocial datastrcutres in their RESTful forms
 //
@@ -66,7 +67,7 @@
     "food" : ["sushi","burgers"],
     "gender" : {
       "key" : "MALE",
-      "displayvalue" : "Male"
+      "displayValue" : "Male"
     },
     "happiestWhen" : "coding",
     "hasApp" : true,
@@ -147,7 +148,7 @@
     "scaredOf" : "COBOL",
     "schools" : [{
       "address" : {
-        "unstructuredAddress" : "1 Edu St.",
+        "unstructuredAddress" : "1 Edu St."
       },
       "description" : "High School",
       "endDate" : "1991-01-01",
@@ -186,7 +187,7 @@
     "id" : "john.doe",
     "gender" : {
       "key" : "MALE",
-      "displayvalue" : "Male"
+      "displayValue" : "Male"
     },
     "hasApp" : true,
     "name" : {
@@ -199,7 +200,7 @@
     "id" : "jane.doe",
     "gender" : {
       "key" : "FEMALE",
-      "displayvalue" : "Female"
+      "displayValue" : "Female"
     },
     "hasApp" : true,
     "name" : {
@@ -212,7 +213,7 @@
     "id" : "george.doe",
     "gender" : {
       "key" : "MALE",
-      "displayvalue" : "Female"
+      "displayValue" : "Female"
     },
     "hasApp" : true,
     "name" : {
@@ -225,7 +226,7 @@
     "id" : "mario.rossi",
     "gender" : {
       "key" : "MALE",
-      "displayvalue" : "Male"
+      "displayValue" : "Male"
     },
     "hasApp" : true,
     "name" : {
@@ -238,7 +239,7 @@
     "id" : "maija.m",
     "gender" : {
       "key" : "FEMALE",
-      "displayvalue" : "Female"
+      "displayValue" : "Female"
     },
     "hasApp" : true,
     "name" : {
@@ -322,7 +323,7 @@
       "id" : "1",
       "userId" : "john.doe",
       "title" : "yellow",
-      "body" : "what a color!",
+      "body" : "what a color!"
     }],
     "jane.doe" : [{
       "id" : "1",