Some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestingFramework/TestingFramework.v12.suo