Merge branch 'develop' into issue-7
use cache_time_keeper
change require for catalog-bundle
Merge branch 'issue-7' into develop