Update 25/07/2014 16:06

-Update mcs_child_addon (not finished)
Merge remote-tracking branch 'origin/master'

Conflicts:
	mcs_child_shop/app/addons/mcs_child_shop/controllers/backend/sync.php
	mcs_child_shop/app/addons/mcs_child_shop/func.php

	mcs_child_shop/design/backend/templates/addons/mcs_child_shop/views/sync/manage.tpl