git loco
Merge branch 'Dev-thread' of https://github.com/TheTonon/ihCarona into Dev-thread

Conflicts:
	ihCarona/ihCarona/Controllers/SettingsViewController.m