Add basic scan item view
Merge remote-tracking branch 'origin/master' into iOS-UI