Have to commit, apparently
Merge remote-tracking branch 'origin/master'

Conflicts:
	WingmanUnleashed/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll