dev branch chenges
hotfix branch chenges
dev branch chenges
Merge branch 'dev'

Conflicts:
	readme2.txt