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

Conflicts:
	MobilSatis/CSAppDelegate.m
ads