[ADD] comments for errorController and view classes
Merge branch 'master' of https://github.com/nix-php-training/ads-board2 into dev
for merge
Merge branch 'dchepiga-master'
[FIX] after pull from upstream
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	framework/core/Dispatcher.php
	index.php
Merge master -> develop
Added Aliases, preparation to use route name
Added static routes for user friendly url
Static routes for user friendly url
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	framework/core/Dispatcher.php
	index.php
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	index.php
Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	index.php
Merge branch 'dev'
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 'master' of https://github.com/nix-php-training/ads-board2
[ADD] composer.json, autoload, class FrontController, APP_ENV in .htaccess
[FIX] routes, layout
Merge pull request #11 from diamond-darrell/master

Add composer autolad