update dev branch
Merge branch 'master' into develop

Conflicts:
	1.txt - fixed
merged develop into master