added some basic stuff for displaying avatars
added new avatar images
implemented showing of avatars
Merge branch 'master' of github.com:POV7DandelionKing/iOSClient
Merge branch 'temp'

Conflicts:
	Encounters.xcodeproj/project.pbxproj