go cai gi day
Merge branch 'master' of https://github.com/AM-Api-Team/amcmsadvertising

Conflicts:
	classes/amjscalladvertising.php
	design/standard/templates/slots/list.tpl
	modules/slots/list.php
	sql/schema.sql
Merge branch 'master' of https://github.com/AM-Api-Team/amcmsadvertising

Conflicts:
	classes/amjscalladvertising.php
Merge branch 'master' of https://github.com/AM-Api-Team/amcmsadvertising