Merge master -> develop
Added Aliases, preparation to use route name
Added static routes for user friendly url
Static routes for user friendly url
fix
Merge pull request #9 from pitcorr/master

Merge
Merge branch 'master' of https://github.com/nix-php-training/ads-board2 into develop
Merge 'develop' to master
Merge pull request #10 from dchepiga/master

Static routes
Merge branch 'develop'

Conflicts:
	framework/core/Controller.php