Added 320 and 640 image styles
Update file view modes
Added 420 image style
Added inline file view mode mapping
Merge branch 'task/17'