fixed a bug in subscriptions
Merge branch 'master' into c2_mohamed_sub_fixingbug
resolved new conflicts
Merge branch 'master' into c2_mohamed_sub_fixingbug
sorted activity log according to date
added some lines in add_post def to inser new rows in AttributeChoice table
added new models
Merge branch 'master' into c2_mohamed_sub_fixingbug
removed annoying prints
added tests #254
#254 add my tests
Merge branch 'master' into C1_Beshoy_FixIntrested
Merge pull request #262 from DinaSaad/C1_Beshoy_FixIntrested

#254 add my tests
added my tests
added views and resolved conflicts
resolved my conflicts
added tests
Merge pull request #244 from DinaSaad/c2_mohamed_sub_fixingbug

fixed a bug in subscriptions
 resolving conflicts