Cherry pick and fix on branch from reference_types

Squash of the difference between account_cards and obj_render
...
Merge develop into obj_render, still has a couple merge problems
Merge remote-tracking branch 'ethan/develop' into obj_render
LINK and INCLUDE defines no longer used (first letter rule 'L' and 'I')
Using different execjs for cucs
Cleaning up pull request, the removal of these images must have been missed in a merge
merge load_cardlib to obj_render, added two specs failing, nested inclusions
Merge branch 'load_cardlib' into obj_render
Merge branch 'load_cardlib' into obj_render
Merged obj_render with pending branches
Fixup some merge misses, mostly in tracked_attributes, ATP now
Merge load_cardlib into obj_render
Merge branch 'load_cardlib' into obj_render
Final load_cardlib changes into obj_render
Remove nesting from obj_render
Fix some tag/trunk merge issues
Removing json/xml stuff (to another branch)
revert unnecessary test change
Cleaning up all_roles so it doesn't fetch for AnonID