Bug 1422480

Also added a filter to the image block to filter by image files

Change-Id: If5665396894f5f9114cca4b449d383efbfc5f94f
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>