Merge branch 'master' into pictures
Adds polymorphic to pictures reviews and pictures coffee; and default avatars
Merge branch 'pictures'