added friends and location marking
Merge branch 'develop' of github.com:User1m/letsmeetup into develop

* 'develop' of github.com:User1m/letsmeetup:
  working on settings