branch test
zhasen 1
zhasen 2
conflict fixed
commit dev
merge with no-ff
fix bug 101
merged bug fix 101
bug 101 fix
merged bug fix 101
test