At least *tried* to set up the Favorites image view
Further bettered saving code
Merge remote-tracking branch 'origin/master'
???
Merge remote-tracking branch 'origin/master'
Cleaned up code spacing, and trying to piss Bogdan off next time he tries to pull