son
Merge branch 'master' of https://github.com/alpkeser/MobilSatis3.8

Conflicts:
	CSCityListViewController.xib
	CSESatisReportsViewController.xib
	CSSharePointSafariViewController.xib
	MobilSatis.xcodeproj/project.pbxproj

MobilSatis.xcodeproj/project.xcworkspace/xcshareddata/MobilSatis.xccheck
out
	MobilSatis/CSCampaignDetailViewController.m
	MobilSatis/CSCityListViewController.xib
	MobilSatis/CSLoginViewController.xib
	Resources-iPad/MobilSatis/CSInfoViewController.xib