Stuff
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM/JAMMM/Physics.cs
	JAMMM/JAMMM/JAMMM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Changes to the cache and suo files.