Fix missing files in karma test. Update travis.yml
Merge branch 'dev'