Fix some tag/trunk merge issues
Merge remote-tracking branch 'origin/obj_render' into account_cards
merging and fixing