He cambiado a tu puta madre2.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WWTBAM/src/main/java/es/serpat/wwtbam/MainActivity.java