Merge pull request #22 from daniellemayne/develop

bugzid 3589: removed paging and fixed image states - develop