HALINA
Merge branch 'master' of https://github.com/paaatryss/Friend-Locator.git

Conflicts:
	app/FriendLocator/bin/FriendLocator.apk
	app/FriendLocator/bin/classes.dex
	app/FriendLocator/bin/resources.ap_