wrq
Merge branch 'develop' of https://github.com/tecle/AndroidProject1 into develop

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
merge
wrq 6.25 11:38
merge
wrq
merge
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.idea/vcs.xml