Merge https://www.github.com/jjeroennl/social

Conflicts:
	includes/register.php