Merge branch 'RC1/master' into templating
added function to select template and added placeholder for article_full_width
Merge branch 'templating' of github.com:motherjones/smokejs into templating