In class optimization
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data Defense/Data Defense-csharp.sln
	Data Defense/Data Defense.sln