Added initial directives for rex (rdf edit xtreme :D)
Merge branch 'develop' of github.com:GeoKnow/Jassa-UI-Angular into develop
Refactored combination demo