Changes:

The File-Cache class was extended
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	system/components/Helper.php