Added actual sites framework support for Page, Block and Image
merged sites framework compatibility changes from master