Revert b3d18e2..8dbeb93

This rolls back to commit b3d18e273fc73ae7ab33ded97fab6118105d1c0f.
Revert 8dbeb93..f37d88b

This rolls back to commit 8dbeb93ebc44fd7a785083ef9a868bc149e66d62.
Revert 681dfa5..7945856

This rolls back to commit 681dfa588f52271b8aa71919af39371463b23e42.
Revert 8dbeb93..8f274d3

This rolls back to commit 8dbeb93ebc44fd7a785083ef9a868bc149e66d62.
Merge branch 'master' of https://github.com/yuanchunfa/yanchaoji10-14

Conflicts:
	Assets/.DS_Store
	Assets/Models/10-20/Materials/gsh.mat.meta
	Assets/Plugins/Android.meta
	Assets/Plugins/Android/libavcodec.so.meta
	Assets/Plugins/Android/libavformat.so.meta
	Assets/Plugins/Android/libavutil.so.meta
	Assets/Plugins/Android/libmetaiosdk.so.meta
	Assets/Plugins/Android/libswresample.so.meta
	Assets/Plugins/Android/libswscale.so.meta
	Assets/Plugins/Android/metaiosdk.jar.meta
	Assets/Plugins/avcodec-54.dll.meta
	Assets/Plugins/avformat-54.dll.meta
	Assets/Plugins/avutil-52.dll.meta
	Assets/Plugins/iOS.meta
	Assets/Plugins/iOS/metaiosdk.meta
	Assets/Plugins/metaioSDK.bundle.meta
	Assets/Plugins/metaioSDK.dll.meta
	Assets/Plugins/pthreadVC2.dll.meta
	Assets/Plugins/swresample-0.dll.meta
	Assets/Plugins/swscale-2.dll.meta
	Assets/Scenes/000.unity
	Assets/Scripts/Tasks/PlayAudioMySelfTask.cs.meta
	Assets/Scripts/Tasks/ReplaceTextureTask.cs.meta
	Assets/StreamingAssets/Tutorial1.meta
	Assets/StreamingAssets/Tutorial1/target.png.meta
	Assets/StreamingAssets/Tutorial1/tracking.xml.meta
	Assets/metaio/Classes.meta
	Assets/metaio/Classes/AssetsManager.cs.meta
	Assets/metaio/Classes/ColorFormat.cs.meta
	Assets/metaio/Classes/Vector2di.cs.meta
	Assets/metaio/Classes/VisualSearchResponse.cs.meta
	Assets/metaio/Editor.meta
	Assets/metaio/Editor/TrackingPatternEditor.cs.meta
	Assets/metaio/Editor/metaioMovieTextureEditor.cs.meta
	Assets/metaio/Editor/metaioSDKEditor.cs.meta
	Assets/metaio/Prefabs.meta
	Assets/metaio/Prefabs/metaioSDK.prefab.meta
	Assets/metaio/Prefabs/metaioTracker.prefab.meta
	Assets/metaio/Prefabs/metaioTrackerLLA.prefab.meta
	Assets/metaio/Scripts.meta
	Assets/metaio/Scripts/instantTracking.cs.meta
	Assets/metaio/Scripts/instantTrackingCallback.cs.meta
	Assets/metaio/Scripts/metaioCallback.cs.meta
	Assets/metaio/Scripts/metaioCamera.cs.meta
	Assets/metaio/Scripts/metaioDeviceCamera.cs.meta
	Assets/metaio/Scripts/metaioMovieTexture.cs.meta
	Assets/metaio/Scripts/metaioSDK.cs.meta
	Assets/metaio/Scripts/metaioTracker.cs.meta
	Assets/metaio/Scripts/metaioTrackerLLA.cs.meta
	Assets/metaio/Scripts/readLLAMarker.cs.meta
	Assets/metaio/Scripts/readQRCodes.cs.meta