release v0.9.6
cg version 0.9.6
conflict fix
Merge pull request #1 from channelgrabber/cgv-0.9.7

[CGIV-60] - CG version 0.9.7