Administration
Mise à jour
Mise a jour
news
Merge branch 'master' of https://github.com/Afxsoft/Framework

Conflicts:
	Application/Controllers/404.php
	Application/Controllers/Index.php
	Library/Core/Controller.php
	Library/Core/Router.php