minor teaks
Merge branch 'develop' of https://github.com/IonutParaschiv/SocialNet into develop

Conflicts:
	scripts/php/registration.php