Michael rd merge develop

Hi,
 I would like to keep my commit history if it is possible. 

Issues in Jira included below

https://mifosforge.jira.com/browse/MIFOSX-1096
https://mifosforge.jira.com/browse/MIFOSX-1097
https://mifosforge.jira.com/browse/MIFOSX-1098
https://mifosforge.jira.com/browse/MIFOSX-1099
https://mifosforge.jira.com/browse/MIFOSX-1100
https://mifosforge.jira.com/browse/MIFOSX-1101
https://mifosforge.jira.com/browse/MIFOSX-1102
https://mifosforge.jira.com/browse/MIFOSX-1103
https://mifosforge.jira.com/browse/MIFOSX-1104
https://mifosforge.jira.com/browse/MIFOSX-1105
https://mifosforge.jira.com/browse/MIFOSX-1106
https://mifosforge.jira.com/browse/MIFOSX-1107
https://mifosforge.jira.com/browse/MIFOSX-1108
https://mifosforge.jira.com/browse/MIFOSX-1109

BR,
Michael