Merge branch 'authentication_fix' of https://github.com/yousraHazem/Topsoft-14 into C2_S15_As_a_child_I_can_choose_my_own_name_with_different_designs_and_a_UNIQE_URL_for_my_account_edited
Unique url is done to use it just type /show/username
Edited Documentation
Edited Documentation
update documentation of routes.rb
update RegisteredUsersController documentation
Solving conflicts with development
Merge branch 'C2_S15_As_a_child_I_can_choose_my_own_name_with_different_designs_and_a_UNIQE_URL_for_my_account_edited' of https://github.com/yousraHazem/Topsoft-14 into C2_S15_As_a_child_I_can_choose_my_own_name_with_different_designs_and_a_UNIQE_URL_for_my_account_edited
Merge pull request #237 from yousraHazem/C2_S15_As_a_child_I_can_choose_my_own_name_with_different_designs_and_a_UNIQE_URL_for_my_account_edited

C2 s15 as a child i can choose my own name with different designs and a uniqe url for my account edited
Merges development