nourhanZ added the final changes to her part
Merge branch 'C4_framework_task_bootstrap' of https://github.com/MGhanem/smartsoft-13 into C4_nourhanZ_CI_PHP

Conflicts:
	framework_task/C4/application/controllers/authentication.php