merge
Merge branch 'master' of github.com:maklemenz/angular-abstract-ui