Add geshi library manually, .make in module is not detected for some reason
Merge branch 'dev'