Merge branch 'refs/heads/master' into develop
Add Cache Class
Merge branch 'refs/heads/develop'