* removed old stuff
Merge branch 'jos-fork' into jos-integration
some layout changes