adding by devel
add changes by release
Merge branch 'release' into devel

Conflicts:
	README.txt