dev-2
Merge branch 'dev'

Conflicts:
	dev-1.txt
master-2