git branch test WL on dev2
Merge branch 'dev2'

Conflicts:
	readme.txt
add merge
merge with no-ff
stash test