added contacts to friendlist and etc.
Merge branch 'master' of github.com:midnight079/4qvk

Conflicts:
	.gitignore