Updated to version 1.1
Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
	CountryPicker/CountryPicker.m