Xcode 6 fix
Merge branch 'master' of github.com:digabriel/GPUImage

Conflicts:
	framework/Source/GPUImageVideoCamera.m