add karma-cli for use in node_modules/.bin
Resolve conflict
Merge branch 'wingyplus-master'