lalala
Merge branch 'master' of https://github.com/Kiachma/WBH

Conflicts:
	res/values/strings.xml