Location test

Conflicts:
	core/res/res/values/config.xml