latest .less and css - cleanup code
Merge branch 'hotfixes' into dev