#3
Merge branch 'master' of github.com:k0sukey/TiCameraView

Conflicts:
	TiCameraView.xcodeproj/project.pbxproj
	TiCameraView.xcodeproj/project.xcworkspace/xcshareddata/TiCameraView.xccheckout
	TiCameraView.xcodeproj/project.xcworkspace/xcuserdata/k_isobe.xcuserdatad/UserInterfaceState.xcuserstate
	TiCameraView.xcodeproj/xcuserdata/k_isobe.xcuserdatad/xcschemes/Build & Test.xcscheme
	TiCameraView.xcodeproj/xcuserdata/k_isobe.xcuserdatad/xcschemes/TiCameraView.xcscheme
removed GPUImage
added .zip