Apply some of the code tweaks from the boostrap3 work to the main develop branch
Some additional tweaks from the bootstrap3 code work
Missed merge updates
Merge branch 'develop' into bootstrap3dave

Conflicts:
	framework/core/forms/controllertemplate.php
	framework/core/forms/controls/bootstrap/buttongroupcontrol.php
	framework/core/forms/form.php
	framework/core/subsystems/expJavascript.php
	framework/modules/forms/controllers/formsController.php
Additional Missed merge updates