Update X
Update D
Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/src/main/res/values/strings.xml