Update Language\nFixed compatible J2.5\nAdd show/hide layout block CSS
Merge conflict