Merge pull request #440 from mdijkstra/master

Removed demos again + added fix to concordance and ${templates} bug
Added Compute 4 demo: asobara
Added Compute 4 demo: burnDown