Delete cach from branch
Merge branch 'master' into banner
Add button save and close, and edit style in makers