Dev3 T1
Merge branch 'Development2' into Dev3

Conflicts:
	initialFile.txt