del logs
fix conflict
fix conflicts
add router.js support
Merge pull request #115 from spyl94/test-design-tree

Test design tree