f
Merge branch 'master' of https://github.com/foozzi/MicroFramework

Conflicts:
	.htaccess
	frontend/img/logo.png
	includes/application.php
	includes/controllers/frontend.php
	includes/controllers/frontend/articles.php
	includes/core/object.php
	includes/core/view.php
	includes/helpers/date.php
	includes/models/article.php
	index.php