added content-container id to html layout
Merge branch 'master' of github.com:jamiebclark/Layout