fix master site to include freemarker from _master
fix master site to include freemarker from _master
refactor composite sites for consistency; remove birt and freemarker staging and replace with latest stables