Merge branch 'master' of https://github.com/Fr4ncis/nightingalepoetry

Conflicts:
	ios/Nightingale/Nightingale.xcodeproj/project.pbxproj
	ios/Nightingale/Nightingale/MapLocationsViewController.m
	ios/Nightingale/Nightingale/MapLocationsViewController.xib
Merge branch 'master' of https://github.com/Fr4ncis/nightingalepoetry

Conflicts:
	ios/Nightingale/Nightingale.xcodeproj/project.pbxproj
	ios/Nightingale/Nightingale/MapLocationsViewController.m
	ios/Nightingale/Nightingale/MapLocationsViewController.xib