- Commented out assetWriter finishWriting because it was causing a compile issue in iOS 6
Merge branch 'master' of https://github.com/vhoto-dev/GPUImage

Conflicts:
	framework/Source/iOS/GPUImageMovieWriter.m