fix
Merge branch 'master' of https://github.com/venjirai/sw14_free_20

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/NokiaPhoneSimulator/.indexes/e4/81/96/c8/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/NokiaPhoneSimulator/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/3790011618.index
	NokiaPhoneSimulator/bin/classes/com/example/nokiaphonesimulator/NokiaPhoneActivity.class