Mi ultima version sin Fallas!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
-App Final Beta(Pena 1.0)