Implemented basic image browsing
Merge branch 'basic' into develop