new files
Merge branch 'development-1.0' into development-2.0

Conflicts:
	file1.txt