Mifosx 1523

number of merge conflicts in this file...