code refactoring
Merge branch 'develop'

Conflicts:
	RCache.php
	RFileCache.php
class abstraction
code style