Flux it, we're doing it live...
Merge branch 'template_import' of github.com:concerto/concerto into template_import

* 'template_import' of github.com:concerto/concerto:
  refactor logic into model