Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/views/error/error.phtml
	framework/classes/ViewHelper.php
	framework/core/Dispatcher.php
	index.php
Merge pull request #8 from dchepiga/master

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

Conflicts:
	framework/core/Dispatcher.php
	index.php