Added karma-cli for Travis-CI
Merge origin/master