two possible crash fixes
Fixes for eyes rolling back in head, macaw head without mapping file.
Merge pull request #1027 from ey6es/master

Fixes for eyes rolling back in head, macaw head without mapping file.
Merge pull request #1025 from ZappoMan/voxel_render_modes

two possible crash fixes
Merge branch 'master' of https://github.com/worklist/hifi into springy

Conflicts:
	interface/src/renderer/FBXReader.cpp
Merge branch 'master' of https://github.com/worklist/hifi into springy