cg changes to v1.7.0
Merge branch 'master' into cgv1.7.0
cg-additions
Merge branch 'master' into cgv1.7.0
Merge branch 'cgv1.7.0' into cgv1.7.1
Merge pull request #2 from channelgrabber/cgv1.7.1

Nginx - Cg v1.7.1