added initial object manager
added object manager
nearly full conversion to new object manager
object manager mods, started rifle mods
Added animation manager, trying to keep it generic.
initial generic animation system
getting what i did in, not in a good state right now.
?
.
.
Merge branch 'master' of https://github.com/louisMyu/GameName1

Conflicts:
	FarSeerTest/obj/ARM/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GameName1.v11.suo
	GameName1/AnimationManager.cs
	GameName1/GameName1.csproj
	GameName1/Rifle.cs
	GameName1/Shotgun.cs
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1.dll
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1.pdb
	GameName1/bin/WindowsPhone/ARM/Debug/GameName1_Debug_ARM.xap
	GameName1/obj/ARM/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GameName1/obj/ARM/Debug/GameName1.csprojResolveAssemblyReference.cache
	GameName1/obj/ARM/Debug/GameName1.dll
	GameName1/obj/ARM/Debug/GameName1.pdb
	GameName1/obj/ARM/Debug/XapCacheFile.xml
.
...
trying to fix merge
hopefully fixed merge now
minor merge fix
small changes
getting this in there
implemented more rifle,fixing shotgun animation and collisions
added some comments on current issue