Added DataManager, Favorited inherits Cities
Merge branch 'master' of https://github.com/TobianClarke/HorseWeatherTurbo

Conflicts:
	HorseWeatherTurbo.xcodeproj/project.pbxproj
	HorseWeatherTurbo/AppDelegate.h
	HorseWeatherTurbo/Base.lproj/Main.storyboard
	HorseWeatherTurbo/TCLCitiesCollectionViewController.m
	HorseWeatherTurbo/TCLCity.m
	HorseWeatherTurbo/TCLCityAddViewController.m
	HorseWeatherTurbo/TCLCityItemViewCell.h
	HorseWeatherTurbo/TCLCityItemViewCell.xib
	HorseWeatherTurbo/TCLFavoritedCollectionViewController.m
	HorseWeatherTurbo/TCLMapViewController.m