Merge pull request #194 from yahiaelgamal/T4_Ahmed_4.1

Story 4.1
5.1_adding_diseases
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T5_jihan_5.1_adding_disease
5.1_story
login + adminlogin +registeration+security adminstartion
Merge branches 'master' and 'T1_lotfy_1.1_and_1.2'
Shopping Cart
add/remove to/from wishlist but tested on the retailer
Merge branch 'master' into T1_lotfy_1.8
1.5_Shopping_Cart_#164
solving lotfy conflicts
adding_diseases_with_recommendations_and_restrictions
not working yet(2.1 - 2.7)
Resolving all session problems, working sign-in/up with the functioning
Merge pull request #206 from DevYah/T1_lotfy_allstories_1.1_1.2_1.8

Resolving all session problems, working sign-in/up with the functioning
#151 Health nutration violations regarding max-min protein,carbohydrate,calcium,fats almost finished
Merge branch 'master' of https://github.com/DevYah/smartsoft-14
Adding story 2.12 for filter search for items
Story 5.5 complete and working
readded the temporary view of the items from the member point of view for the dependeant story, the story is not finished yet, need to have a proper UI, please merge after code verifying only