basic templating
Merge remote-tracking branch 'alex/master'
combo box changes