somne shit
Merge remote-tracking branch 'origin/initial' into initial

Conflicts:
	OurProject/res/values/strings.xml