merge

indra/develop.py

indra/llcharacter/llbvhloader.h

indra/llcharacter/lljoint.cpp

indra/llcharacter/llkeyframewalkmotion.cpp

indra/llcharacter/llstatemachine.cpp

indra/llinventory/llnotecard.cpp

indra/llmessage/llares.cpp

indra/llmessage/llcachename.cpp

indra/llmessage/llhttpassetstorage.cpp

indra/llmessage/llhttpnode.h

indra/llmessage/llinstantmessage.cpp

indra/llmessage/lliohttpserver.cpp

indra/llmessage/llmessagetemplate.h

indra/llmessage/llxfer.cpp

indra/llmessage/message.cpp

indra/llmessage/partsyspacket.cpp

indra/llprimitive/llmaterialtable.cpp

indra/llprimitive/llmaterialtable.h

indra/llrender/llfontfreetype.cpp

indra/llui/llconsole.cpp