add gallery and photo scaffolding and relationships in between and polymorphic one with hotel
install carrierwave, rmagick, provide thumbnails and remote uploads
resolve conflict merging with master
upload images via ajax with jquery uploader
get rid of mercury
crop thimbnails
add watermark to big image, not saving original file
connect a photo to a gallery
integrate gallery into hotel
integrate galleries with rooms and refactor integration architecture within single file
fix conflict