Merging with origin.
Merge branch 'master' of https://github.com/vbledar/swapper
Updating item views.