Merge branch 'MIFOSX-1875' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1875

Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandWrapper.java
	mifosng-provider/src/main/java/org/mifosplatform/commands/service/CommandWrapperBuilder.java
	mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java

mifosng-provider/src/main/resources/sql/migrations/core_db/V206_7__password_validation_policy.sql

@@ -0,0 +1,31 @@
+
+CREATE TABLE IF NOT EXISTS `m_password_validation_policy` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `regex` text NOT NULL,
+  `description` text NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+
+INSERT INTO `m_password_validation_policy` (
+`id` ,
+`regex` ,
+`description` ,
+`active`
+)
+VALUES (
+NULL ,  '^.{1,50}$',  'Password most be at least 1 character and not more that 50 characters long',  '1'
+);
+
+INSERT INTO `m_password_validation_policy` (
+`id` ,
+`regex` ,
+`description` ,
+`active`
+)
+VALUES (
+NULL ,  '^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\\s).{6,50}$',  'Password must be at least 6 characters, no more than 50 characters long, must include at least one upper case letter, one lower case letter, one numeric digit and no space',  '0'
+);
+
+

mifosng-provider/src/main/resources/sql/migrations/core_db/V206_8__password_validation_policy_permissions.sql

@@ -0,0 +1,7 @@
+INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
+VALUE ("authorisation","READ_PASSWORD_VALIDATION_POLICY","PASSWORD_VALIDATION_POLICY","READ",0);
+
+INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
+VALUE ("authorisation","UPDATE_PASSWORD_VALIDATION_POLICY","PASSWORD_VALIDATION_POLICY","UPDATE",0);
+
+