Add control type as an additional class name on the from-group div for all rock controls
Merge branch 'origin/develop'