diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 88ed51e5e..c829ba5bf 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -679,7 +679,6 @@ var jqxhr = $.ajax({
             </div>
         </div>
     
-    
         <a id="clients_template" name="clients_template" class="old-syle-anchor">&nbsp;</a>
         <div class="method-section">
             <div class="method-description">
@@ -773,9 +772,10 @@ Request Body:
  "joinedDate": "04 March 2009"
 }
 </code>
-<code class="method-response">
-{
- "resourceId":23
+<code class="method-response">{
+  "officeId": 1,
+  "clientId": 83,
+  "resourceId": 83
 }
 </code>
     </div>
@@ -792,9 +792,10 @@ Request Body:
  "joinedDate": "13 June 2006"
 }
 </code>
-<code class="method-response">
-{
- "resourceId":26
+<code class="method-response">{
+  "officeId": 1,
+  "clientId": 84,
+  "resourceId": 84
 }
 </code>
     </div>
@@ -807,7 +808,7 @@ Request Body:
     </div>
     <div class="method-example">
         <code class="method-declaration">PUT https://Domain Name/api/v1/clients/{clientId}</code>
-<code class="method-request">PUT clients/23
+<code class="method-request">PUT clients/83
 Content-Type: application/json
 Request Body:
 { 
@@ -817,7 +818,18 @@ Request Body:
  "joinedDate": "09 June 2006"
 }
 </code>
-<code class="method-response">{ "resourceId": 23}</code>
+<code class="method-response">{
+  "officeId": 1,
+  "clientId": 83,
+  "resourceId": 83,
+  "changes": {
+    "externalId": "786444UUUYYH7",
+    "joinedDate": "09 June 2006",
+    "dateFormat": "dd MMMM yyyy",
+    "locale": "en"
+  }
+}
+</code>
     </div>
 </div>
         
@@ -838,13 +850,61 @@ Request Body:
     <div class="method-example">
         <code class="method-declaration">GET https://Domain Name/api/v1/clients/{clientId}/loans</code>
 <code class="method-response">{
-  "anyLoanCount": 3,
+  "anyLoanCount": 9,
+  "pendingApprovalLoanCount": 4,
+  "pendingApprovalLoans": [
+    {
+      "id": 48,
+      "accountNo": "48",
+      "productId": 1,
+      "productName": "PORetailLoan",
+      "status": {
+        "id": 100,
+        "code": "loanStatusType.submitted.and.pending.approval",
+        "value": "Submitted and pending approval"
+      }
+    },
+    {
+      "id": 50,
+      "accountNo": "50",
+      "productId": 1,
+      "productName": "PORetailLoan",
+      "status": {
+        "id": 100,
+        "code": "loanStatusType.submitted.and.pending.approval",
+        "value": "Submitted and pending approval"
+      }
+    },
+    {
+      "id": 51,
+      "accountNo": "51",
+      "productId": 1,
+      "productName": "PORetailLoan",
+      "status": {
+        "id": 100,
+        "code": "loanStatusType.submitted.and.pending.approval",
+        "value": "Submitted and pending approval"
+      }
+    },
+    {
+      "id": 62,
+      "accountNo": "62",
+      "productId": 3,
+      "productName": "Further Loan Product",
+      "status": {
+        "id": 100,
+        "code": "loanStatusType.submitted.and.pending.approval",
+        "value": "Submitted and pending approval"
+      }
+    }
+  ],
   "activeLoanCount": 2,
   "openLoans": [
     {
-      "id": 22,
+      "id": 46,
+      "accountNo": "46",
       "productId": 1,
-      "productName": "Agricultural Loan",
+      "productName": "PORetailLoan",
       "status": {
         "id": 300,
         "code": "loanStatusType.active",
@@ -852,9 +912,10 @@ Request Body:
       }
     },
     {
-      "id": 44,
+      "id": 60,
+      "accountNo": "60",
       "productId": 1,
-      "productName": "Agricultural Loan",
+      "productName": "PORetailLoan",
       "status": {
         "id": 300,
         "code": "loanStatusType.active",
@@ -862,17 +923,40 @@ Request Body:
       }
     }
   ],
-  "closedLoanCount": 1,
+  "closedLoanCount": 3,
   "closedLoans": [
     {
-      "id": 33,
+      "id": 22,
+      "accountNo": "22",
       "productId": 1,
-      "productName": "Agricultural Loan",
+      "productName": "PORetailLoan",
+      "status": {
+        "id": 700,
+        "code": "loanStatusType.overpaid",
+        "value": "Overpaid"
+      }
+    },
+    {
+      "id": 33,
+      "accountNo": "33",
+      "productId": 1,
+      "productName": "PORetailLoan",
       "status": {
         "id": 601,
         "code": "loanStatusType.closed.written.off",
         "value": "Closed (written off)"
       }
+    },
+    {
+      "id": 44,
+      "accountNo": "44",
+      "productId": 1,
+      "productName": "PORetailLoan",
+      "status": {
+        "id": 600,
+        "code": "loanStatusType.closed.obligations.met",
+        "value": "Closed (obligations met)"
+      }
     }
   ]
 }
@@ -880,7 +964,6 @@ Request Body:
     </div>
 </div>
 
-
 <a id="clients_notes" name="clients_notes" class="old-syle-anchor">&nbsp;</a>
 <div class="method-section">
     <div class="method-description">
@@ -895,37 +978,24 @@ Request Body:
     </div>
     <div class="method-example">
         <code class="method-declaration">GET https://Domain Name/api/v1/clients/{clientId}/notes</code>
-<code class="method-response">[ {
-  "id" : 20,
-  "clientId" : 2,
-  "noteType" : {
-    "id" : 100,
-    "code" : "noteType.client",
-    "value" : "Client note"
-  },
-  "note" : "This is an extra note!",
-  "createdById" : 2,
-  "createdByUsername" : "super1",
-  "createdOn" : 1335066625000,
-  "updatedById" : 2,
-  "updatedByUsername" : "super1",
-  "updatedOn" : 1335066625000
-}, {
-  "id" : 16,
-  "clientId" : 2,
-  "noteType" : {
-    "id" : 100,
-    "code" : "noteType.client",
-    "value" : "Client note"
-  },
-  "note" : "loan only 1/2 amount expected\r\nyes",
-  "createdById" : 2,
-  "createdByUsername" : "super1",
-  "createdOn" : 1334726104000,
-  "updatedById" : 2,
-  "updatedByUsername" : "super1",
-  "updatedOn" : 1335137893000
-} ]
+<code class="method-response">[
+  {
+    "id": 2,
+    "clientId": 1,
+    "noteType": {
+      "id": 100,
+      "code": "noteType.client",
+      "value": "Client note"
+    },
+    "note": "First note\r\n\r\nedited",
+    "createdById": 1,
+    "createdByUsername": "mifos",
+    "createdOn": 1342498505000,
+    "updatedById": 1,
+    "updatedByUsername": "mifos",
+    "updatedOn": 1342498517000
+  }
+]
 </code>
     </div>
 </div>
@@ -945,7 +1015,9 @@ Request Body:
 }
 </code>
 <code class="method-response">{
- "resourceId": 40
+  "officeId": 1,
+  "clientId": 1,
+  "resourceId": 76
 }
 </code>
     </div>
@@ -956,27 +1028,27 @@ Request Body:
     <div class="method-description">
         <h4>Retrieve a Client Note</h4>
         <p>Example Requests: </p>
-        <div class=apiClick>clients/2/notes/20</div>
+        <div class=apiClick>clients/1/notes/76</div>
         <br><br>
-        <div class=apiClick>clients/2/notes/20?fields=note,createdOn,createdByUsername</div>
+        <div class=apiClick>clients/1/notes/76?fields=note,createdOn,createdByUsername</div>
     </div>
     <div class="method-example">
         <code class="method-declaration">GET https://Domain Name/api/v1/clients/{clientId}/notes/{noteId}</code>
         <code class="method-response">{
-  "id" : 20,
-  "clientId" : 2,
-  "noteType" : {
-    "id" : 100,
-    "code" : "noteType.client",
-    "value" : "Client note"
+  "id": 76,
+  "clientId": 1,
+  "noteType": {
+    "id": 100,
+    "code": "noteType.client",
+    "value": "Client note"
   },
-  "note" : "This is an extra note!",
-  "createdById" : 2,
-  "createdByUsername" : "super1",
-  "createdOn" : 1335066625000,
-  "updatedById" : 2,
-  "updatedByUsername" : "super1",
-  "updatedOn" : 1335066625000
+  "note": "a note about the client",
+  "createdById": 1,
+  "createdByUsername": "mifos",
+  "createdOn": 1359463135000,
+  "updatedById": 1,
+  "updatedByUsername": "mifos",
+  "updatedOn": 1359463135000
 }
 </code>
     </div>
@@ -989,7 +1061,7 @@ Request Body:
     </div>
     <div class="method-example">
         <code class="method-declaration">PUT https://Domain Name/api/v1/clients/{clientId}/notes/{noteId}</code>
-<code class="method-request">PUT clients/2/notes/20
+<code class="method-request">PUT clients/1/notes/76
 Content-Type: application/json
 Request Body:
 {
@@ -997,7 +1069,12 @@ Request Body:
 }
 </code>
 <code class="method-response">{
- "resourceId": 20
+  "officeId": 1,
+  "clientId": 1,
+  "resourceId": 76,
+  "changes": {
+    "note": "and here the note is updated nicely."
+  }
 }
 </code>
     </div>
diff --git a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql b/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql
index 408dbc663..d0fdfd78e 100644
--- a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql
+++ b/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql
@@ -323,18 +323,10 @@ CREATE TABLE `m_group` (
   `name` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `created_date` datetime DEFAULT NULL,
-  `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `external_id` (`external_id`),
-  KEY `FKJPWG000000000003` (`createdby_id`),
-  KEY `FKJPWG000000000004` (`lastmodifiedby_id`),
   KEY `office_id` (`office_id`),
-  CONSTRAINT `FKJPWG000000000003` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
-  CONSTRAINT `FKJPWG000000000004` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_group_ibfk_1` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -350,19 +342,11 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `created_date` datetime DEFAULT NULL,
-  `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
-  KEY `FKAUD0000000000001` (`createdby_id`),
-  KEY `FKAUD0000000000002` (`lastmodifiedby_id`),
-  CONSTRAINT `FKAUD0000000000001` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
-  CONSTRAINT `FKAUD0000000000002` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=347 DEFAULT CHARSET=utf8;
 
diff --git a/mifosng-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql b/mifosng-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
index 19aa35857..b770464f7 100644
--- a/mifosng-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
+++ b/mifosng-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
@@ -2058,4 +2058,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2013-01-29 11:37:27
+-- Dump completed on 2013-01-29 12:54:03
diff --git a/mifosng-db/multi-tenant-demo-backups/bk_mifostenant_default.sql b/mifosng-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
index 95fa91833..818f7927e 100644
--- a/mifosng-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
+++ b/mifosng-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
@@ -433,19 +433,11 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `created_date` datetime DEFAULT NULL,
-  `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
-  KEY `FKAUD0000000000001` (`createdby_id`),
-  KEY `FKAUD0000000000002` (`lastmodifiedby_id`),
-  CONSTRAINT `FKAUD0000000000001` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
-  CONSTRAINT `FKAUD0000000000002` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -456,7 +448,7 @@ CREATE TABLE `m_client` (
 
 LOCK TABLES `m_client` WRITE;
 /*!40000 ALTER TABLE `m_client` DISABLE KEYS */;
-INSERT INTO `m_client` VALUES (1,'1',1,NULL,'Willie',NULL,'O\'Meara',NULL,'Willie O\'Meara',NULL,'2009-01-04',1,'2012-04-12 22:07:44','2012-04-12 22:07:44',1,0),(2,'2',1,NULL,'Declan',NULL,'Browne',NULL,'Declan Browne',NULL,'2009-01-04',1,'2012-04-12 22:15:39','2012-04-12 22:15:39',1,0),(3,'3',1,NULL,'Ja',NULL,'Fallon',NULL,'Ja Fallon',NULL,'2009-01-11',1,'2012-04-12 22:16:30','2012-04-12 22:16:30',1,0),(4,'4',1,NULL,'Peter',NULL,'Lambert',NULL,'Peter Lambert',NULL,'2009-01-11',1,'2012-04-12 22:17:01','2012-04-12 22:17:01',1,0),(5,'5',1,NULL,NULL,NULL,NULL,'Sunnyville vegetable growers Ltd','Sunnyville vegetable growers Ltd',NULL,'2009-01-24',1,'2012-04-12 22:19:18','2012-04-12 22:19:18',1,0),(6,'6',2,NULL,'Jacques',NULL,'Lee',NULL,'Jacques Lee',NULL,'2012-04-03',1,'2012-04-14 06:09:22','2012-08-01 13:50:13',1,0),(7,'7',1,NULL,'Kalilou',NULL,'Traor',NULL,'Kalilou Traor',NULL,'2009-02-04',1,'2012-04-14 09:38:11','2012-04-14 09:38:11',1,0),(8,'8',1,NULL,'Sidi',NULL,'Kon',NULL,'Sidi Kon',NULL,'2009-02-11',1,'2012-04-14 09:45:43','2012-04-14 09:45:43',1,0),(9,'9',1,'9_null','Moustapha',NULL,'Yattabar',NULL,'Moustapha Yattabar',NULL,'2009-02-18',1,'2012-04-14 10:24:20','2012-12-01 10:28:48',1,1),(10,'10',1,NULL,NULL,NULL,NULL,'Mali fruit sales ltd.','Mali fruit sales ltd.',NULL,'2009-02-18',1,'2012-04-14 10:25:37','2012-04-14 10:25:37',1,0),(11,'11',1,NULL,NULL,NULL,NULL,'Djenne co-op group','Djenne co-op group',NULL,'2009-02-25',1,'2012-04-14 10:31:03','2012-04-14 10:31:03',1,0),(12,'12',1,NULL,NULL,NULL,NULL,'Heavens Family','Heavens Family',NULL,'2012-07-19',1,'2012-07-19 15:03:47','2012-07-19 15:03:47',1,0),(13,'13',7,NULL,NULL,NULL,NULL,'U Thanung','U Thanung',NULL,'2012-07-19',1,'2012-07-19 16:01:49','2012-07-19 16:01:49',1,0),(14,'14',16,NULL,'Customer',NULL,'One',NULL,'Customer One',NULL,'2012-07-23',1,'2012-07-23 04:27:18','2012-07-23 04:27:18',1,0),(15,'15',12,NULL,NULL,NULL,NULL,'HGT 28','HGT 28',NULL,'2012-07-28',1,'2012-07-28 11:28:16','2012-07-28 11:28:16',1,0),(16,'16',10,'somethingless','Wale',NULL,'Afolabie',NULL,'Wale Afolabi','/root/.mifosx/DefaultDemoTenant/images/clients/16/JPEG_example_JPG_RIP_010.jpg','2012-08-19',1,'2012-08-19 08:58:44','2012-12-19 15:19:37',1,0),(17,'17',6,NULL,NULL,NULL,NULL,'Agri','Agri',NULL,'2012-08-27',1,'2012-08-27 17:02:28','2012-11-15 07:37:02',1,0),(18,'18',1,NULL,NULL,NULL,NULL,'Hardrock Hotel','Hardrock Hotel','/root/.mifosx/DefaultDemoTenant/images/clients/18/240px-Felis_silvestris_silvestris_small_gradual_decrease_of_quality.png','2012-08-09',1,'2012-09-04 16:38:30','2012-11-09 13:07:18',1,0),(19,'19',1,NULL,NULL,NULL,NULL,'Hardrock Hotel','Hardrock Hotel',NULL,'2012-08-09',1,'2012-09-04 16:38:30','2012-09-04 16:38:30',1,0),(20,'20',1,NULL,'rama',NULL,'shama',NULL,'rama shama',NULL,'2012-09-04',1,'2012-09-04 16:39:36','2012-09-04 16:39:36',1,0),(21,'21',1,NULL,'safik',NULL,'omara',NULL,'safik omara',NULL,'2012-09-05',1,'2012-09-05 09:10:58','2012-09-05 09:10:58',1,0),(22,'22',1,NULL,'Michael',NULL,'Wan',NULL,'Michael Wan','/root/.mifosx/DefaultDemoTenant/images/clients/22/logo.png','2011-11-03',1,'2012-09-05 09:10:59','2012-12-12 07:09:53',1,0),(23,'23',1,NULL,'trips',NULL,'sundari',NULL,'trips sundari',NULL,'2012-09-05',1,'2012-09-05 14:30:32','2012-09-05 14:30:32',1,0),(24,'24',1,'24_1337','Lex',NULL,'Luthor',NULL,'Lex Luthor',NULL,'2012-09-07',1,'2012-09-07 18:34:50','2012-09-07 18:56:29',1,1),(25,'25',1,NULL,'Clark',NULL,'Kent',NULL,'Clark Kent',NULL,'2012-09-07',1,'2012-09-07 19:22:33','2012-09-07 19:22:33',1,0),(26,'26',1,NULL,'Bruce',NULL,'Wayne',NULL,'Bruce Wayne',NULL,'2012-09-07',1,'2012-09-07 19:23:17','2012-09-07 19:23:17',1,0),(27,'27',7,'123456',NULL,NULL,NULL,'Sugar Bauman','Sugar Bauman','/root/.mifosx/DefaultDemoTenant/images/clients/27/Chrysanthemum.jpg','2012-09-07',1,'2012-09-07 20:10:54','2012-11-20 13:31:04',1,0),(28,'28',1,NULL,NULL,NULL,NULL,'NagpurMFOSX','NagpurMFOSX',NULL,'2012-09-21',1,'2012-09-21 17:09:51','2012-09-21 17:09:51',1,0),(29,'29',1,NULL,NULL,NULL,NULL,'LocalMIFOS','LocalMIFOS',NULL,'2012-09-22',1,'2012-09-22 08:00:12','2012-09-22 08:00:12',1,0),(30,'30',13,'30_444',NULL,NULL,NULL,'Aloha Technology','Aloha Technology',NULL,'2012-09-25',1,'2012-09-25 10:00:07','2012-12-01 07:58:07',1,1),(31,'31',13,'1111',NULL,NULL,NULL,'wwwwww','wwwwww',NULL,'2012-09-25',1,'2012-09-25 11:33:28','2012-09-25 11:33:28',1,0),(32,'32',12,'111',NULL,NULL,NULL,'new client','new client',NULL,'2012-09-25',1,'2012-09-25 11:36:30','2012-09-25 11:36:30',1,0),(33,'33',1,NULL,NULL,NULL,NULL,'Balaji builder','Balaji builder','/root/.mifosx/DefaultDemoTenant/images/clients/33/places.png','2012-09-25',1,'2012-09-25 11:44:47','2012-11-16 08:57:06',1,0),(34,'34',1,NULL,'Firstname',NULL,'Surname',NULL,'Firstname Surname',NULL,'2012-10-12',1,'2012-10-12 17:12:36','2012-10-12 17:12:36',1,0),(35,'35',1,NULL,'Joe',NULL,'Public',NULL,'Joe Public',NULL,'2012-10-01',1,'2012-10-31 02:54:58','2012-10-31 02:54:58',1,0),(36,'36',20,'36_null','Ramesh',NULL,'Rathod',NULL,'Ramesh Rathod',NULL,'2012-11-15',1,'2012-11-15 05:19:01','2012-11-15 05:34:12',1,1),(37,'37',20,NULL,'Ramesh',NULL,'Rathod',NULL,'Ramesh Rathod','/root/.mifosx/DefaultDemoTenant/images/clients/37/lau-fig05_005 - Copy.jpg','2012-11-15',1,'2012-11-15 05:19:01','2012-11-15 05:34:53',1,0),(38,'38',1,'2121','jkhjk',NULL,'mhvh',NULL,'jkhjk mhvh',NULL,'2012-11-15',1,'2012-11-15 07:55:06','2012-11-15 07:55:06',1,0),(39,'39',1,'1','Madhukar',NULL,'Reddy',NULL,'Madhukar Reddy',NULL,'2012-11-24',1,'2012-11-24 12:13:55','2012-11-24 12:13:55',1,0),(40,'40',1,'123456778','test',NULL,'user',NULL,'test user',NULL,'2012-12-01',1,'2012-12-01 08:02:29','2012-12-01 08:02:29',1,0),(41,'41',1,NULL,'Kannan',NULL,'P',NULL,'Kannan P',NULL,'2012-12-01',1,'2012-12-01 08:35:25','2012-12-01 08:35:25',1,0),(42,'42',1,'786YYH7','Petra',NULL,'Yton',NULL,'Petra Yton',NULL,'2009-03-04',1,'2012-12-01 14:37:18','2012-12-01 14:37:18',1,0),(43,'43',1,NULL,'john',NULL,'call',NULL,'john call','/root/.mifosx/DefaultDemoTenant/images/clients/43/image.jpeg','2012-11-26',1,'2012-12-01 15:34:00','2012-12-18 20:03:41',1,0),(44,'44',1,NULL,'john',NULL,'callaghn',NULL,'john callaghn',NULL,'2012-12-01',1,'2012-12-01 15:39:12','2012-12-01 15:39:12',1,0),(45,'45',1,NULL,'john',NULL,'callaghan',NULL,'john callaghan',NULL,'2012-11-27',1,'2012-12-01 15:40:27','2012-12-01 15:40:27',1,0),(46,'46',1,NULL,'john',NULL,'callaghan',NULL,'john callaghan',NULL,'2012-11-28',1,'2012-12-01 15:50:07','2012-12-01 15:50:07',1,0),(47,'47',10,NULL,'Test',NULL,'Client',NULL,'Test Client','/root/.mifosx/DefaultDemoTenant/images/clients/47/image.jpeg','2012-12-01',1,'2012-12-01 19:12:26','2012-12-27 08:01:26',1,0),(48,'48',1,NULL,'Kannan',NULL,'P',NULL,'Kannan P',NULL,'2012-12-02',1,'2012-12-02 06:17:51','2012-12-02 06:17:51',1,0),(49,'49',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',1,'2012-12-02 12:46:34','2012-12-02 12:46:34',1,0),(50,'50',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',1,'2012-12-02 12:58:33','2012-12-02 12:58:33',1,0),(51,'51',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',1,'2012-12-02 13:07:35','2012-12-02 13:07:35',1,0),(52,'52',19,NULL,'Han',NULL,'Solo',NULL,'Han Solo',NULL,'2012-12-02',1,'2012-12-02 15:05:25','2012-12-02 15:05:25',1,0),(53,'53',16,NULL,'Another',NULL,'Client',NULL,'Another Client',NULL,'2012-12-02',1,'2012-12-02 15:24:10','2012-12-02 15:24:10',1,0),(54,'54',17,NULL,'Clark',NULL,'Kent',NULL,'Clark Kent',NULL,'2012-12-02',1,'2012-12-02 16:03:27','2012-12-02 16:03:27',1,0),(55,'55',6,'114554','sayantan',NULL,'tarafdar',NULL,'sayantan tarafdar',NULL,'2012-12-05',1,'2012-12-05 15:20:21','2012-12-05 15:20:21',1,0),(56,'56',10,'funtoosh_decorators_1',NULL,NULL,NULL,'Funtoosh Decorators','Funtoosh Decorators',NULL,'2012-12-06',1,'2012-12-06 16:57:56','2012-12-06 16:57:56',1,0),(57,'57',1,NULL,'Uganda',NULL,'client',NULL,'Uganda client',NULL,'2011-12-07',1,'2012-12-07 11:04:14','2012-12-07 11:04:14',1,0),(58,'58',22,NULL,'Hong',NULL,'Chan',NULL,'Hong Chan','/root/.mifosx/DefaultDemoTenant/images/clients/58/logo.png','2012-04-01',1,'2012-12-12 07:26:27','2012-12-12 08:05:12',24,0),(59,'59',1,NULL,'Peter',NULL,'Pan',NULL,'Peter Pan',NULL,'2012-12-12',1,'2012-12-12 07:27:06','2012-12-12 07:27:06',1,0),(60,'60',1,NULL,'user',NULL,'user',NULL,'user user',NULL,'2012-12-13',1,'2012-12-13 16:40:37','2012-12-13 16:40:37',1,0),(61,'61',10,'445','father',NULL,'lastname',NULL,'father lastname',NULL,'2012-12-18',1,'2012-12-18 20:52:29','2012-12-18 20:52:29',1,0),(62,'62',1,'avinash','Test',NULL,'avinash',NULL,'Test avinash',NULL,'2012-12-20',1,'2012-12-20 06:38:04','2012-12-20 06:38:04',1,0),(63,'63',1,NULL,'?',NULL,'lklkl',NULL,'Sander Heyden',NULL,'2012-12-20',1,'2012-12-20 12:35:39','2013-01-10 14:35:37',1,0),(64,'64',21,'447','father',NULL,'lastname',NULL,'father lastname',NULL,'2012-12-21',1,'2012-12-21 09:14:41','2012-12-21 09:14:41',1,0),(65,'65',1,NULL,'aaaa',NULL,'aaaaa',NULL,'aaaa aaaaa',NULL,'2012-12-24',1,'2012-12-24 04:07:11','2012-12-24 04:07:11',1,0),(66,'66',1,'1234515','Bla',NULL,'DieBla',NULL,'Bla DieBla',NULL,'2013-01-02',1,'2013-01-02 15:54:04','2013-01-02 15:54:04',1,0),(67,'67',25,'67_null','Zayyad',NULL,'Alawy',NULL,'Zayyad Alawy',NULL,'2013-01-14',25,'2013-01-14 10:47:54','2013-01-18 12:04:44',1,1),(69,'69',1,'mustaq','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',1,'2013-01-19 15:37:29','2013-01-19 15:37:29',1,0),(71,'71',1,'mustaq1','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',1,'2013-01-19 15:37:55','2013-01-19 15:37:55',1,0),(72,'72',1,'mustaq2','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',1,'2013-01-19 16:34:07','2013-01-19 16:34:07',1,0),(73,'73',1,'73_umar','umar',NULL,'farooq',NULL,'umar farooq',NULL,'2011-01-20',1,'2013-01-20 07:53:32','2013-01-21 05:55:37',1,1),(74,'74',1,'74_umar1','umar1',NULL,'farooq',NULL,'umar1 farooq',NULL,'2012-01-20',1,'2013-01-20 08:00:57','2013-01-21 05:55:49',1,1),(75,'75',1,'mustaq9','shaik',NULL,'ahmed',NULL,'shaik ahmed',NULL,'2013-01-20',1,'2013-01-20 08:03:42','2013-01-20 08:03:42',1,0),(76,'76',1,'hi','shaik',NULL,'shaik',NULL,'shaik shaik',NULL,'2012-01-20',1,'2013-01-21 16:05:40','2013-01-21 16:05:40',1,0),(79,'79',1,'test','Shiva',NULL,'kumar',NULL,'Shiva kumar',NULL,'2013-01-12',1,'2013-01-22 04:03:33','2013-01-22 04:03:33',1,0),(80,'80',1,'true','shiva',NULL,'sir',NULL,'shiva sir',NULL,'2012-01-12',1,'2013-01-23 05:26:01','2013-01-23 05:26:01',1,0),(81,'81',1,'Through Dynamic Mobile form (HT)','Suhas',NULL,'Through Dynamic Mobile form (HT)',NULL,'Suhas Through Dynamic Mobile form (HT)',NULL,'2012-01-22',1,'2013-01-23 05:29:39','2013-01-23 05:29:39',1,0);
+INSERT INTO `m_client` VALUES (1,'1',1,NULL,'Willie',NULL,'O\'Meara',NULL,'Willie O\'Meara',NULL,'2009-01-04',0),(2,'2',1,NULL,'Declan',NULL,'Browne',NULL,'Declan Browne',NULL,'2009-01-04',0),(3,'3',1,NULL,'Ja',NULL,'Fallon',NULL,'Ja Fallon',NULL,'2009-01-11',0),(4,'4',1,NULL,'Peter',NULL,'Lambert',NULL,'Peter Lambert',NULL,'2009-01-11',0),(5,'5',1,NULL,NULL,NULL,NULL,'Sunnyville vegetable growers Ltd','Sunnyville vegetable growers Ltd',NULL,'2009-01-24',0),(6,'6',2,NULL,'Jacques',NULL,'Lee',NULL,'Jacques Lee',NULL,'2012-04-03',0),(7,'7',1,NULL,'Kalilou',NULL,'Traor',NULL,'Kalilou Traor',NULL,'2009-02-04',0),(8,'8',1,NULL,'Sidi',NULL,'Kon',NULL,'Sidi Kon',NULL,'2009-02-11',0),(9,'9',1,'9_null','Moustapha',NULL,'Yattabar',NULL,'Moustapha Yattabar',NULL,'2009-02-18',1),(10,'10',1,NULL,NULL,NULL,NULL,'Mali fruit sales ltd.','Mali fruit sales ltd.',NULL,'2009-02-18',0),(11,'11',1,NULL,NULL,NULL,NULL,'Djenne co-op group','Djenne co-op group',NULL,'2009-02-25',0),(12,'12',1,NULL,NULL,NULL,NULL,'Heavens Family','Heavens Family',NULL,'2012-07-19',0),(13,'13',7,NULL,NULL,NULL,NULL,'U Thanung','U Thanung',NULL,'2012-07-19',0),(14,'14',16,NULL,'Customer',NULL,'One',NULL,'Customer One',NULL,'2012-07-23',0),(15,'15',12,NULL,NULL,NULL,NULL,'HGT 28','HGT 28',NULL,'2012-07-28',0),(16,'16',10,'somethingless','Wale',NULL,'Afolabie',NULL,'Wale Afolabi','/root/.mifosx/DefaultDemoTenant/images/clients/16/JPEG_example_JPG_RIP_010.jpg','2012-08-19',0),(17,'17',6,NULL,NULL,NULL,NULL,'Agri','Agri',NULL,'2012-08-27',0),(18,'18',1,NULL,NULL,NULL,NULL,'Hardrock Hotel','Hardrock Hotel','/root/.mifosx/DefaultDemoTenant/images/clients/18/240px-Felis_silvestris_silvestris_small_gradual_decrease_of_quality.png','2012-08-09',0),(19,'19',1,NULL,NULL,NULL,NULL,'Hardrock Hotel','Hardrock Hotel',NULL,'2012-08-09',0),(20,'20',1,NULL,'rama',NULL,'shama',NULL,'rama shama',NULL,'2012-09-04',0),(21,'21',1,NULL,'safik',NULL,'omara',NULL,'safik omara',NULL,'2012-09-05',0),(22,'22',1,NULL,'Michael',NULL,'Wan',NULL,'Michael Wan','/root/.mifosx/DefaultDemoTenant/images/clients/22/logo.png','2011-11-03',0),(23,'23',1,NULL,'trips',NULL,'sundari',NULL,'trips sundari',NULL,'2012-09-05',0),(24,'24',1,'24_1337','Lex',NULL,'Luthor',NULL,'Lex Luthor',NULL,'2012-09-07',1),(25,'25',1,NULL,'Clark',NULL,'Kent',NULL,'Clark Kent',NULL,'2012-09-07',0),(26,'26',1,NULL,'Bruce',NULL,'Wayne',NULL,'Bruce Wayne',NULL,'2012-09-07',0),(27,'27',7,'123456',NULL,NULL,NULL,'Sugar Bauman','Sugar Bauman','/root/.mifosx/DefaultDemoTenant/images/clients/27/Chrysanthemum.jpg','2012-09-07',0),(28,'28',1,NULL,NULL,NULL,NULL,'NagpurMFOSX','NagpurMFOSX',NULL,'2012-09-21',0),(29,'29',1,NULL,NULL,NULL,NULL,'LocalMIFOS','LocalMIFOS',NULL,'2012-09-22',0),(30,'30',13,'30_444',NULL,NULL,NULL,'Aloha Technology','Aloha Technology',NULL,'2012-09-25',1),(31,'31',13,'1111',NULL,NULL,NULL,'wwwwww','wwwwww',NULL,'2012-09-25',0),(32,'32',12,'111',NULL,NULL,NULL,'new client','new client',NULL,'2012-09-25',0),(33,'33',1,NULL,NULL,NULL,NULL,'Balaji builder','Balaji builder','/root/.mifosx/DefaultDemoTenant/images/clients/33/places.png','2012-09-25',0),(34,'34',1,NULL,'Firstname',NULL,'Surname',NULL,'Firstname Surname',NULL,'2012-10-12',0),(35,'35',1,NULL,'Joe',NULL,'Public',NULL,'Joe Public',NULL,'2012-10-01',0),(36,'36',20,'36_null','Ramesh',NULL,'Rathod',NULL,'Ramesh Rathod',NULL,'2012-11-15',1),(37,'37',20,NULL,'Ramesh',NULL,'Rathod',NULL,'Ramesh Rathod','/root/.mifosx/DefaultDemoTenant/images/clients/37/lau-fig05_005 - Copy.jpg','2012-11-15',0),(38,'38',1,'2121','jkhjk',NULL,'mhvh',NULL,'jkhjk mhvh',NULL,'2012-11-15',0),(39,'39',1,'1','Madhukar',NULL,'Reddy',NULL,'Madhukar Reddy',NULL,'2012-11-24',0),(40,'40',1,'123456778','test',NULL,'user',NULL,'test user',NULL,'2012-12-01',0),(41,'41',1,NULL,'Kannan',NULL,'P',NULL,'Kannan P',NULL,'2012-12-01',0),(42,'42',1,'786YYH7','Petra',NULL,'Yton',NULL,'Petra Yton',NULL,'2009-03-04',0),(43,'43',1,NULL,'john',NULL,'call',NULL,'john call','/root/.mifosx/DefaultDemoTenant/images/clients/43/image.jpeg','2012-11-26',0),(44,'44',1,NULL,'john',NULL,'callaghn',NULL,'john callaghn',NULL,'2012-12-01',0),(45,'45',1,NULL,'john',NULL,'callaghan',NULL,'john callaghan',NULL,'2012-11-27',0),(46,'46',1,NULL,'john',NULL,'callaghan',NULL,'john callaghan',NULL,'2012-11-28',0),(47,'47',10,NULL,'Test',NULL,'Client',NULL,'Test Client','/root/.mifosx/DefaultDemoTenant/images/clients/47/image.jpeg','2012-12-01',0),(48,'48',1,NULL,'Kannan',NULL,'P',NULL,'Kannan P',NULL,'2012-12-02',0),(49,'49',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',0),(50,'50',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',0),(51,'51',1,NULL,'Brendan',NULL,'Fahy',NULL,'Brendan Fahy',NULL,'2012-12-01',0),(52,'52',19,NULL,'Han',NULL,'Solo',NULL,'Han Solo',NULL,'2012-12-02',0),(53,'53',16,NULL,'Another',NULL,'Client',NULL,'Another Client',NULL,'2012-12-02',0),(54,'54',17,NULL,'Clark',NULL,'Kent',NULL,'Clark Kent',NULL,'2012-12-02',0),(55,'55',6,'114554','sayantan',NULL,'tarafdar',NULL,'sayantan tarafdar',NULL,'2012-12-05',0),(56,'56',10,'funtoosh_decorators_1',NULL,NULL,NULL,'Funtoosh Decorators','Funtoosh Decorators',NULL,'2012-12-06',0),(57,'57',1,NULL,'Uganda',NULL,'client',NULL,'Uganda client',NULL,'2011-12-07',0),(58,'58',22,NULL,'Hong',NULL,'Chan',NULL,'Hong Chan','/root/.mifosx/DefaultDemoTenant/images/clients/58/logo.png','2012-04-01',0),(59,'59',1,NULL,'Peter',NULL,'Pan',NULL,'Peter Pan',NULL,'2012-12-12',0),(60,'60',1,NULL,'user',NULL,'user',NULL,'user user',NULL,'2012-12-13',0),(61,'61',10,'445','father',NULL,'lastname',NULL,'father lastname',NULL,'2012-12-18',0),(62,'62',1,'avinash','Test',NULL,'avinash',NULL,'Test avinash',NULL,'2012-12-20',0),(63,'63',1,NULL,'?',NULL,'lklkl',NULL,'Sander Heyden',NULL,'2012-12-20',0),(64,'64',21,'447','father',NULL,'lastname',NULL,'father lastname',NULL,'2012-12-21',0),(65,'65',1,NULL,'aaaa',NULL,'aaaaa',NULL,'aaaa aaaaa',NULL,'2012-12-24',0),(66,'66',1,'1234515','Bla',NULL,'DieBla',NULL,'Bla DieBla',NULL,'2013-01-02',0),(67,'67',25,'67_null','Zayyad',NULL,'Alawy',NULL,'Zayyad Alawy',NULL,'2013-01-14',1),(69,'69',1,'mustaq','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',0),(71,'71',1,'mustaq1','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',0),(72,'72',1,'mustaq2','Mustaq',NULL,'Ahmed',NULL,'Mustaq Ahmed',NULL,'2012-01-20',0),(73,'73',1,'73_umar','umar',NULL,'farooq',NULL,'umar farooq',NULL,'2011-01-20',1),(74,'74',1,'74_umar1','umar1',NULL,'farooq',NULL,'umar1 farooq',NULL,'2012-01-20',1),(75,'75',1,'mustaq9','shaik',NULL,'ahmed',NULL,'shaik ahmed',NULL,'2013-01-20',0),(76,'76',1,'hi','shaik',NULL,'shaik',NULL,'shaik shaik',NULL,'2012-01-20',0),(79,'79',1,'test','Shiva',NULL,'kumar',NULL,'Shiva kumar',NULL,'2013-01-12',0),(80,'80',1,'true','shiva',NULL,'sir',NULL,'shiva sir',NULL,'2012-01-12',0),(81,'81',1,'Through Dynamic Mobile form (HT)','Suhas',NULL,'Through Dynamic Mobile form (HT)',NULL,'Suhas Through Dynamic Mobile form (HT)',NULL,'2012-01-22',0);
 /*!40000 ALTER TABLE `m_client` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -823,18 +815,10 @@ CREATE TABLE `m_group` (
   `name` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `created_date` datetime DEFAULT NULL,
-  `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `external_id` (`external_id`),
-  KEY `FKJPWG000000000003` (`createdby_id`),
-  KEY `FKJPWG000000000004` (`lastmodifiedby_id`),
   KEY `office_id` (`office_id`),
-  CONSTRAINT `FKJPWG000000000003` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
-  CONSTRAINT `FKJPWG000000000004` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_group_ibfk_1` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -845,7 +829,7 @@ CREATE TABLE `m_group` (
 
 LOCK TABLES `m_group` WRITE;
 /*!40000 ALTER TABLE `m_group` DISABLE KEYS */;
-INSERT INTO `m_group` VALUES (1,7,'GWT_2','GWT_EX_ID_2',0,1,'2012-12-03 16:08:24','2012-12-03 16:08:24',1),(2,1,'group22','11234',0,1,'2012-12-11 15:43:09','2012-12-11 15:43:09',1),(3,22,'PlusOne',NULL,0,1,'2012-12-12 08:01:02','2012-12-12 08:01:02',1),(4,1,'Njangui',NULL,0,1,'2013-01-19 10:36:57','2013-01-19 10:36:57',1);
+INSERT INTO `m_group` VALUES (1,7,'GWT_2','GWT_EX_ID_2',0),(2,1,'group22','11234',0),(3,22,'PlusOne',NULL,0),(4,1,'Njangui',NULL,0);
 /*!40000 ALTER TABLE `m_group` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2087,4 +2071,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2013-01-29 11:39:04
+-- Dump completed on 2013-01-29 12:55:44
diff --git a/mifosng-db/patches/07-drop-audit-columns-of-client-groups.sql b/mifosng-db/patches/07-drop-audit-columns-of-client-groups.sql
new file mode 100644
index 000000000..744d8b37d
--- /dev/null
+++ b/mifosng-db/patches/07-drop-audit-columns-of-client-groups.sql
@@ -0,0 +1,23 @@
+ALTER TABLE `m_client` 
+DROP FOREIGN KEY `FKAUD0000000000002` , 
+DROP FOREIGN KEY `FKAUD0000000000001`; 
+
+ALTER TABLE `m_client` 
+DROP COLUMN `lastmodifiedby_id` , 
+DROP COLUMN `lastmodified_date` , 
+DROP COLUMN `created_date` , 
+DROP COLUMN `createdby_id`  , 
+DROP INDEX `FKAUD0000000000002`  ,
+DROP INDEX `FKAUD0000000000001`;
+
+ALTER TABLE `m_group` 
+DROP FOREIGN KEY `FKJPWG000000000004` , 
+DROP FOREIGN KEY `FKJPWG000000000003`;
+
+ALTER TABLE `m_group` 
+DROP COLUMN `lastmodifiedby_id` ,
+DROP COLUMN `lastmodified_date` ,
+DROP COLUMN `created_date` ,
+DROP COLUMN `createdby_id`  ,
+DROP INDEX `FKJPWG000000000004`  ,
+DROP INDEX `FKJPWG000000000003`;
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
index 7f0d73a81..96cc46855 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
@@ -12,15 +12,14 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
 import org.mifosplatform.organisation.office.domain.Office;
 import org.mifosplatform.portfolio.client.domain.Client;
 import org.mifosplatform.portfolio.group.command.GroupCommand;
-import org.mifosplatform.useradministration.domain.AppUser;
+import org.springframework.data.jpa.domain.AbstractPersistable;
 
 @Entity
 @Table(name = "m_group")
-public class Group extends AbstractAuditableCustom<AppUser, Long> {
+public class Group extends AbstractPersistable<Long> {
 
     @SuppressWarnings("unused")
     @ManyToOne