update new file
Merge branch 'master' of https://github.com/AM-Api-Team/amcmsadvertising

Conflicts:
	design/standard/templates/adslot/edit.tpl
	design/standard/templates/adslot/list.tpl
	modules/adslot/list.php
	settings/site.ini.append.php