renaming input_group attribute to addon_icon, enhancing formgroup template
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
	tw2/bootstrap/forms/templates/formgroup_layout.mak
	tw2/bootstrap/forms/widgets.py