Dogsom V2.0
up v2.1
Merge branch 'master' of https://github.com/YobiByteLabs/Rescatapp

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml