some
fixed conflicts
Merge branch 'secondDemo' of https://github.com/nromanen/Ch-024 into secondDemo
tests
Merge branch 'secondDemo' of https://github.com/nromanen/Ch-024 into secondDemo
fixed bug with drag and drop event and fixed tests