Pruebas AsyncTask y JSON.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DogsON/src/edu/uoc/dogson/MainActivity.java
	DogsON/src/edu/uoc/dogson/Task1.java