gem
deactivating imagemagick
Merge pull request #372 from alaashafaee/Design_Akram

Pull Request: Design_Akram_deactivating_imagemagick
Fixing conflicts with master