fix style files
Merge remote-tracking branch 'origin/Major-Update-' into Major-Update-

Conflicts:
	iPAWS/iPAWS.csproj