Update 1
Merge branch 'master' of https://github.com/znsstudio/EcommerceAdmin

Conflicts:
	admin_index_preaction.php