Updated to version 1.2
Merge branch 'master' into devel

Conflicts:
	CountryPicker/Countries.plist