CSS adjustments
fix tokenization in collocations, and other CSS/JavaScript fixes
Merge pull request #129 from clovis/master

More fixes