Interfaz pantalla principal

Modificación interfaz pantalla principal poniendo botones redondos
Merge remote-tracking branch 'origin/Rama-Edu-Android' into Rama-Android

Conflicts:
	KitchApp/bin/classes.dex
	KitchApp/bin/kitchApp.apk
	KitchApp/bin/resources.ap_