Fix merging of properties type and description#104

progval merged 6 commits intomastercodemeta/codemeta.github.io:masterfrom

merge-properties-json-prioritycodemeta/codemeta.github.io:merge-properties-json-priorityCopy head branch name to clipboard