Merge branch 'master' into Xander
Added blank template
Initial site template (page.tpl.php)
Merge branch 'Xander'