Fixes
Merge branch 'master' into thomas
Added image view to camera roll icon.