Merge branch 'master' into marty
removed header from container class
Merge branch 'master' into marty
Removed some items that made it in from a bad merge
Merge branch 'marty'