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
Code improvements with bug fixes
Naming convenction changes
Merge pull request #52 from KamilLelonek/ios

[UserStory] MYGUIDE-244 As a user I would like to see list of animals on iOS
Changed address of GPX files generator

Previous address pointed to generator capable only of generating paths
in UK. This stopped us from creating relevant cases for testing. Current
generator is capable of creating paths in Wroclaw ZOO.
Merge pull request #54 from tkozik/doc_fixup

Changed address of GPX files generator
Added .gitattributes file with default options

Git attributes help greatly with managing pseudo-binary *.pbxproj files.
I added default option to treat those as binary files and set default
merge strategy to "ours". In the future it would be nice to add custom
filter which would check which settings in *.pbxproj files changed and
list those changes in human readable way.
Merge branch 'GitAttributes' of https://github.com/tkozik/MyGuide into GitAttributes