Fixes #239 Change 'control-group' to 'form-group'
Issue #239 Rename ControlGroup.html to FormGroup.html

Remove <div class="controls"
Fixes #243 FontAwesomeIconType should use 'icon icon-xyz' class names
Merge remote-tracking branch 'upstream/bootstrap3' into bootstrap3

Conflicts:
	bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/FormGroup.html