resolved all conflicts and fixed the jquery problem #91

@nadeembarakat @Reem-Sharkawy