mifosx-317
mifosx-318
Merge remote-tracking branch 'upstream/master'
Merge pull request #152 from wuyanna/master

mifosx-318