fixed misplaced resource
Merge branch 'master' into geolabel