core files
Merge branch 'master' of https://github.com/nasaralla/basephp

Conflicts:
	code/Core/Engine.php