commit change
Merge remote-tracking branch 'origin/master'

Conflicts:

	BootstrapFormBuilder/FormBuilder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache