Improved content background support
Merge branch 'master' of https://github.com/swisspol/Cooliris-ToolKit