26/2/2557
26/2/2557 new
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/c/promotion/add.php
	admin/c/promotion/edit.php
	index.php
26/2/2557 new