fixed merge conflicts
Merge pull request #6 from ukutaht/carrierwave

Added multiple images support for items