Update AppController.php

manual merge