No more .f
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f

Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
Merge pull request #3837 from Atlante45/death_to_dot_f

Death to the '.f's