Merging latest Bitbucket code. Migrated from SASS to LESS