Merge branch 'release-0.1'
Merge branch 'fixes-0.11'
Merge branch 'master' of github.com:pkerpedjiev/forna into develop
Colored node outlines
Fixed conflicts