upd: templates
Merge branch 'master' of git://github.com/j-schumann/application-base