Changed from hardcoding to strings.
Merge branch 'master' of https://github.com/hakkepakke/Lufteapp
last changes.-
Merge branch 'master' of https://github.com/hakkepakke/Lufteapp

Conflicts:
	res/values-nb/strings.xml
	res/values/strings.xml
Fixed conflicts and merged.
Fixed merg problems.