making some type casts abide by coding standard
merge upstream/master into enforce-standard

Conflicts:
	interface/src/avatar/Hand.cpp
Merge pull request #2538 from AndrewMeadows/enforce-standard

making some type casts abide by coding standard