merge
Merge remote-tracking branch 'origin/develop' into develop

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