switch to frlayout2
Merge branch 'master' into preprocess
revert to frlayout
Merge branch 'master' into preprocess
add support for node categories and colors
Merge branch 'master' into preprocess