ovil
ovil
ovil
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/mobile.iml
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/res/values/strings.xml
	wear/wear.iml