Updated bower dependencies and fixed karma unit test configuration to work with the updated dependencies.
Merged with the latest seed and fixed merge conflicts.