Added reset configuration after use set() and add()
Merge branch 'feature/chaining' into develop

Conflicts:
	cache.class.php
	demo/demo.cache.php
Prepare version 2.1. Merge develop/master
Merge branch 'release/2.1' into develop