changed image to friendImage.
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	www/maps.php