Merge remote-tracking branch 'origin/master'

Conflicts:

	XNA_ScreenManager/XNA_ScreenManagerContent/XNA_ScreenManagerContent.contentproj