Change control-group to form-group.
Fix unit test.
Merge branch 'master' of https://github.com/jarnstedt/former