.
Merge remote-tracking branch 'origin/master'

Conflicts:
	open-sms-postman/res/values/strings.xml