added assets to build
Merge branch 'RC1/master' into RC1/consistant_api
updated templates to match render changes
updated docs and code