Merchandise Image Service + Updatované Merchandise DAO.
Merge remote-tracking branch 'origin/master'