grunt karma
Merge branch 'develop' of https://github.com/janantala/angular-adaptive into develop