commit
commit
commit
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	action/admin/ProductAction.class.php
	action/admin/UploadAction.class.php
	action/admin/skin/Product/editArea.php
	action/admin/skin/Product/image.php
	action/admin/skin/Product/index.php
	config.php