Web layout of main areas
Merge branch 'master' of https://github.com/jaivox/tools

merging with developed versio 8/18/13