editing for geolocation
editing for geolocation
Merge branch 'master' of https://github.com/lordgreg/Sfen

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
Merge branch 'master' of https://github.com/lordgreg/Sfen

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml