Merge branch 'icon-sets' of https://github.com/bholzer/angular-xeditable