*Fix templates
Merge branch 'master' of github.com:stunko/inavex