App Ad controller update
Merge code_revision

Conflicts:
	modules/app/controller/advertisement.php