Merge CG and WG templates

[marcoscaceres]

The CG template is subset of WG template.... we should merge them.

[marcoscaceres]

We need to design it so that stuff from WGs doesn't end up in CGs tho... maybe we should keep them separate :( The risk goes the other way.