fix travis.yml ( karma failed )
Merge remote-tracking branch 'origin/master'