Friend hit work
Merge branch 'master' of https://github.com/vankovilija/everyoneisafriend

Conflicts:
	everyoneisafriend.userprefs