article
Merge branch 'test'

Conflicts:
	application/bootstrap.php
	application/classes/Controller/Admin/Category.php
	application/classes/Model/Article.php
	application/classes/Model/Article/Categories.php
	application/views/admin/category/index.twig
	application/views/layout/html.twig
	media/css/page_article/atricle.css