merge with mapjs
Merge branch 'master' of github.com:mindmup/mindmup
merge with mapjs