feds

sfdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	siriusmagic/assets/components/doodles/js/connector.php