fix .gitignore
re-add cache/files folder
Merge branch 'feature-portal' into development