Animals list implemented
Animals list finished
Merge branch 'gps' into animals

* gps:
  Remarks changes
  Removed redundant delegator
  [MYGUIDE-243] As a user I would like to see GPS popup if i have GPS turned off on iOS

Conflicts:
	MyGuide/MapViewController.h
	MyGuide/MapViewController.m
	MyGuide/en.lproj/Main.strings
Pointer improvements
Merge branch 'animals' into ios

* animals:
  Pointer improvements
  Animals list finished
  Animals list implemented

Conflicts:
	MyGuide/Base.lproj/Main.storyboard
	MyGuide/MapViewController.m