Try to sync repo with Rafał
Add .properties + update .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	geoMMO_android/res/values/strings.xml