Merge branch 'hotfix-1.1.4' into live
Fixes to page.tpl.php for merge conflicts
Installed Features module
Merge branch 'release-1.1.6' into live
Still messing with page.tpl.php