Added working rotation/scaling fixes
Merge branch 'master' of https://github.com/miriammelnick/bounce

Conflicts:
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/BounceLib.csproj.Debug.cachefile
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Content/BounceLibContent.contentproj
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Content/obj/Windows Phone/Debug/BounceLibContent.contentproj.FileListAbsolute.txt
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Content/obj/Windows Phone/Debug/BounceLibContent.contentprojResolveAssemblyReference.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Content/obj/Windows Phone/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/App.g.cs
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/App.g.i.cs
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/GamePage.g.cs
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/GamePage.g.i.cs
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/MDIL/BounceLib.dll
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/MDIL/MDILXapCompileLog.txt
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/MDIL/Tutorial8 - Optical Marker Tracking - Silverlight.dll
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/MDILCacheFile.xml
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/Tutorial8 - Optical Marker Tracking - Silverlight.csproj.FileListAbsolute.txt
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/Tutorial8 - Optical Marker Tracking - Silverlight.csprojResolveAssemblyReference.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/Tutorial8 - Optical Marker Tracking - Silverlight.dll
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/Tutorial8 - Optical Marker Tracking - Silverlight.pdb
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Silverlight/obj/Debug/XapCacheFile.xml
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/Tutorial8_Phone.cs
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/BounceLib.csproj.FileListAbsolute.txt
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/BounceLib.csprojResolveAssemblyReference.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/BounceLib.dll
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/BounceLib.pdb
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/ContentPipeline-{5D6CF3FC-3284-40C3-A428-2B5A03BCB208}.xml
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/bouncelevel1panels_0.xml
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/cachefile-{5D6CF3FC-3284-40C3-A428-2B5A03BCB208}-targetpath.txt
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/golf_ball_0.xml
	Tutorial - Zhixiang Wu/Tutorial8 - Optical Marker Tracking/obj/Windows Phone/Debug/hikingstick3_0.xml
	Tutorial - Zhixiang Wu/Tutorials (Phone).v11.suo
	Tutorial - Zhixiang Wu/bin/Windows Phone/MDIL/Tutorial8 - Optical Marker Tracking - Silverlight.dll
	Tutorial - Zhixiang Wu/bin/Windows Phone/Tutorial8 - Optical Marker Tracking - Silverlight.dll
	Tutorial - Zhixiang Wu/bin/Windows Phone/Tutorial8 - Optical Marker Tracking - Silverlight.pdb
	Tutorial - Zhixiang Wu/bin/Windows Phone/Tutorial8___Optical_Marker_Tracking___Phone.xap