Merge pull request #84 from arax/2.5.x

[Critical] Fixed links in text/occi