Merge remote-tracking branch 'origin/master'

Conflicts:

	SharePointProject1/SharePointProject1/VisualWebPart1/VisualWebPart1UserControl.ascx