add dev3
merge wit no-ff
fixed bug
merge dev3 fieed bug
git merge buglist