Order Clients and Teams Alphabetically

This commit fixes #958