reverted deleted files and changes
Merge branch 'error_fix'

Conflicts:
	Alicephp/Mvc/ComponentLoader.php
	Alicephp/Mvc/ViewStringStorage.php