broken client controller test- need to fix stubbing
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
Merge pull request #428 from safiyu/issue

fixed issue #326
Products accounting API clean up
fixed issue 424
Merge pull request #433 from pramodn02/MIFOSX-795

MIFOSX-795 : Products accounting API clean up
Merge pull request #434 from safiyu/issue

fixed issue #424