Merge pull request #39 from arax/client-dev

Updated DSL, bin/occi and tests