Strings.xml Manifest
Created the Mobile side application
Merge remote-tracking branch 'origin/master'

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