Hopefully fixed the spring animation?
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs