commit api ads
Merge branch 'master' of https://github.com/AM-Api-Team/amcmsadvertising

Conflicts:
	classes/rest_controller.php
	classes/rest_provider.php