Merge branch 'test'
Add server identifier
Remove site ID from full width page add page.tpl.php
Add site IDr to page.tpl
More ID testing and setup
Cont
A bit more code
Merge branch 'master' into test