release4
Merge branch 'origin/master'

Conflicts:
	readme.txt
Feature6
Finish feature-1
Finish VersionTagrelease-4