fix bad merge
configure to run in test
integrate lesscss again
update code to work with WIP branch
fix composer