Merge "Allow user to change AiAi's permissions." into pi-dev