Merge pull request #434 from mdijkstra/master

Bug fix compute4
Created template DataTransfer.sh.ftl + added corresponding error handling to validator.
Added error message if protocol is present in both templates folder and protocols folder.