Merge branch 'BR80-AdjustingPathsForKarmaTesting'
Merge branch 'master' of https://github.com/br80/testproj into BR80-AdjustingPathsForKarmaTesting