updated
Merge branch 'master' of https://github.com/cupsadarius/Flake

Conflicts:
	.htaccess
	application/assets/Db/DbConnection.php
	application/assets/Registry.php
	application/assets/Request.php
	application/assets/Routes/Bindings.php
	application/assets/Routes/Constrains.php
	application/assets/Routes/Route.php
	application/assets/Routes/RouteManager.php
	application/controllers/ControllerFactory.php
	application/controllers/HomeController.php
	application/views/layout.html.twig
	index.php