test
Merge branch 'master' of https://github.com/fitzlucassen/passangerv2

Conflicts:
	Library/Core/Cache.php
	Library/Core/Dispatcher.php
	Library/Core/Error.php
	Library/Core/Logger.php
	Library/Core/ModuleManager.php
	Library/Core/QueryBuilder.php
	Library/Core/RepositoryManager.php
	Library/Core/Request.php
	Library/Core/Router.php
	Library/Core/Sql.php
	Library/Core/UrlRewriting.php
	Library/Core/View.php
	app.class.php