Added reset method
Added reset method
Merge origin/master

Conflicts:
	changelog.txt
	framework/classes/handler/Error.class.php