Merge branch 'master' into C2_heba_private_public_option
resolved conflicts #189
trying #189
added the link to go to the private settings #189
useless
useless #189
added the required attributes to set to private #189
the needed views, urls and added 3 new fields in userprofile model #189
added the required urls to change from private to public and vice versa #189
added the required views #189
added the private page #189
resolved conflicts #189
added 2 attributes for the private to public and vice versa to worl #189
modified the page #189
added the documentation #189
removed the heads and master from part i didn't know it was changed by beshoy #189
resolved conflicts #189
removed the head #189
Merge branch 'master' into C2_heba_public_private_option
 modified the views and private #189