I changed later
qMerge remote-tracking branch 'origin/dev' into dev

Conflicts:
	readme.txt