Added sms notification
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/fn.catalog.php
	skins/basic/admin/views/shippings/update.tpl
Added sms notification