profile page
profile page
Merge branch 'develop' of https://github.com/IonutParaschiv/SocialNet into develop

Conflicts:
	style/css/master.css