commit
Merge branch 'develop' of https://github.com/iHamburg/KQ into develop

Conflicts:

KQ.xcworkspace/xcuserdata/qing.xcuserdatad/UserInterfaceState.xcuserstat
e
	KQ/ViewController/CityViewController.m
	KQ/ViewController/MainViewController.h
	KQ/ViewController/MainViewController.m