string values for all layouts
Merge branch 'master' of ssh://github.com/bladenight/bladenightapp-android

Conflicts:
	res/values/strings.xml