switch files for combo and chz styles
bugfix
Merge branch 'master' of github.com:niquola/ng-w