test merge dev
Merge branch 'DEV' into F1

Conflicts:
	GitHubTest2013_2/Class1.cs