Fixed failing test in ViewClientController spec
Fixed warning in karma test runner
Merge pull request #1031 from aaron-edwards/master

Fix for failing unit tests in ViewClientController
Merge branch 'master' into develop