merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unit_Testing/BattleField7UnitTests/bin/Debug/loggs.txt
	bin/Debug/loggs.txt