merge CSS
Merge branch 'master' of https://github.com/sigma-gclc/colibri-gclc.git
add imgscalr depedency