Merge pull request #152 from wuyanna/master

mifosx-318
mifosx317 ui adjust
Merge remote-tracking branch 'upstream/master'