test
test
test
Acl
start auth
Auth refactoring
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge pull request #9 from pitcorr/master

Merge
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