aasdasdasd
Merge remote-tracking branch 'origin/master'

Conflicts:
	android_code/res/values/strings.xml