Added actual sites framework support for Page, Block and Image
Merge branch 'master' into menutree