C4_S0_adding interaction with group
Merge branch 'master' of https://github.com/yousraHazem/Topsoft-14 into C4_S0_Leave_and_interact_with_group

Conflicts:
	kidzen/config/initializers/secret_token.rb
	kidzen/config/routes.rb
Merge pull request #91 from yousraHazem/C4_S0_Leave_and_interact_with_group

merged