Fixed the damn cell image view
Merge branch 'master' into controller