add newline in end of file
remove not used class
use cache_time_keeper
Merge branch 'issue-4' into develop
revert catalog version for tests