Configure Compass
Merge branch 'develop'