Re-added activities route
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  Add template preview tests for #322.