Pull Request: C3_Mimi_586_resolve_conflicts_activeAdmin_willPaginate

#586 
@Ahmed-Atef  @ahmed93  @Rania-Abdel-Fattah  @AmirGeorge please review