internationalization support
Merge branch 'master' of https://github.com/marcusvsilveira/lehman-android

Conflicts:
	res/values/strings.xml