Added rescue for activity templates that don't exist
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  (1) + (3) was decided for #362.This implements (3)