fixed bug with loading of corrupt settings file where NaN returned for avatar position details
fix CR feedback
Merge pull request #521 from ZappoMan/master

Fixed issue with corrupt settings file, added offset camera details to settings
more work on avatar touch
Merge remote-tracking branch 'upstream/master'