added automatic width/height for ElementContainer
Merge branch 'nick'