Merge
Merge branch 'master' of http://github.com/bronycub/v2

Conflicts:
	header.php
Fix and make responsiv Logo !
Fix friend page for name of Friend
Correct friend page.