[refactor] resolve conflict
Merge branch 'develop' of github.com:nsuinteger/trailfinder-ios into develop

# By Subhransu Behera
# Via Subhransu Behera
* 'develop' of github.com:nsuinteger/trailfinder-ios:
  [Added] Menu Controller
  [ADDED] Login Controller
[add] paypal sdk