App update / server merge

signup and team join added