Import of v2 beta6
Adjusted subpanel header
Nav fixes
Remove footer
Merged 2.0 with OpenSocial version