Bugfix: do not user controller.merge_conditions instead use arel where()
Bugfix: do not user controller.merge_conditions instead use arel where()

ajacksified/active_scaffold,silverpond/active_scaffold,vhochstein/active_scaffold,ajacksified/active_scaffold,silverpond/active_scaffold,silverpond/active_scaffold,asoltys/active_scaffold,BookingBug/active_scaffold,BookingBug/active_scaffold,vhochstein/active_scaffold,vhochstein/active_scaffold,asoltys/active_scaffold,BookingBug/active_scaffold