modify for dev branch file
chang dev to master

Conflicts:
	readme.txt
last change for master

Conflicts:
	readme.txt
conflict resolved