soc
Merge remote-tracking branch 'origin/master'

Conflicts:
	SvitlaCMF/Api/SocNet/Facebook.php
	SvitlaCMF/Mod/Apanel/Blocks/Fbtest.php
	SvitlaCMF/Mod/Apanel/Controller.php
auth done