Create POIs on a map
Conflict may be resolved. Couldn't try out.
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject