Merge branch 'master' of https://github.com/marhag/Mappe2

Conflicts:
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
added some strings(lost in merge), small fix