Merge for menu
Merge
Resource files are cleaned.
Push for merge