add beta to base template, refs #630
Merge branch 'master' into integration