merge
Merge branch 'master' of https://github.com/anthony-ism/ism-angular-lib