fix problems with duplicated angular includes
karma should include files based on server/config/assets.json
Merge jackjsu878-pr3