Merge branch 'master' into develop
don't show character pulldown when no guildmembers
Merge branch 'develop'