Commit origin/master

Main changes on views and AdvertController.php