# Conflicts:
#	application/api_broker/service/OrderLogService.php
#	application/index/view/global/footer_tpl.html