more optimizations and bug fixes
bug fix
add missing data attributes in collocations template
use new strip_tags function in collocations, bug fixes
Merge pull request #166 from clovis/master

bug fixes and optimizations