Updated pages to have the correct fields.
Added icons to display on selecting a picon.
Added an image picker for the icons.
Merge branch 'icon_selector' into develop