Fixing css gallery issue with variable names
Merge branch 'refs/heads/mockup' into develop