hui
Merge branch 'L1Qu0R'

Conflicts:
	includes/config/class.Autoloader.php
test