resolved all conflicts and fixed the jquery problem #91
Merge pull request #179 from DinaSaad/C3_hammad_sprint1

resolved all conflicts and fixed the jquery problem #91