Point carrierwave-mongoid and mongoid-grid_fs to master branches to resolve activemodel dependency error
Merge pull request #1609 from rainkingventures/resolve_mongoid_dependency_conflicts

Point carrierwave-mongoid and mongoid-grid_fs to master branches to reso...