add image and type to pages
Merge branch 'master' into ubuntu-12.04.precise