accommodate merging classes in code with those defined in add-all declarations
Merge branch 'dev' of github:mchapman/forms-angular into dev