LOCATION, CARALHO!
Merge branch 'Dev-thread' of https://github.com/TheTonon/ihCarona into Dev-thread

Conflicts:
ihCarona/ihCarona/Controllers/HikingViewController.m
Git burro