Article and Image logic encapsulated in classes
Merge branch 'master' into encapsulation
Category encapsulated in a class
Fix in category listing