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

Conflicts:
	app/src/main/java/com/exploratoria/adexploratoria/MainActivity.java
Toni