adjust video camera to ios7
Merge branch 'master' of github.com:sergiosvieira/GPUImage into HEAD

Conflicts:
	framework/Source/GPUImageVideoCamera.m
bug fix on image picture