stict mod javascript
conflict merging
Merge branch 'dev' into gh-pages
Merge remote-tracking branch 'origin' into gh-pages
deleted draggable