shop model comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/libraries/scommon.php