Fixed problem with picker when there are no buildings.
Changes to Avatar API, Minor Bug Fixes