User underscore template for skill view
Merge branch 'master' into compiled