Update gems
Stop tracking and remove images from repository
Merge branch 'develop'