style.css is changed
Merge branch 'integration_branch'