Jasmine Tests are merged.
karma config changes
x
Merge remote-tracking branch 'origin/master'