fix velocity drift of MyAvatar
remove warning about extra tokens at end of #endif directive
merge upstream/master into andrew/inertia

Conflicts:
	interface/src/Application.cpp
Merge pull request #3398 from AndrewMeadows/inertia

fix velocity drift of MyAvatar