1.1.6: Merge pull request #33 from phillprice/feature/label-holder-classes

Enable adding classes to input and label directly (also needs work in display-logic module)