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

Conflicts:
	application/libraries/apns_notification.php