fix crashes for local game (commited with avatar-ignore feature)
tinyxml use STL for android
Merge remote-tracking branch 'origin/master'