broken client controller test- need to fix stubbing
collection sheet issue is fixed
Merge pull request #411 from goutham-M/mifosx-collectionsheet-fix

collection sheet issue is fixed
Update README.md
translations reformatted
Merge pull request #414 from safiyu/issues

translations reformatted
added missing translations
Merge pull request #415 from safiyu/translations

added missing translations
tried things
passing tests
passing client controller test
removed whitespace
Merge branch 'client_controller_tests'
fixed merge conflicts in specrunner
fixed issue #423 and missing translations

bug
Merge pull request #417 from chelseakomlo/master

Added ClientController and UserSettingsController Tests
Merge pull request #425 from safiyu/translations

fixed issue #423 and missing translations
integrated grunt build task
fixed issue #326
Merge pull request #426 from ashok-conflux/grunt-integration

integrated grunt build task