Support css as well as less
Merge branch 'develop'