Minor fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/grupoidea/ideaapp/activities/GestionPedidosActivity.java