Merge branch 'master' of https://github.com/RecetAppOmarIsaac/RecetApp into dialogs

Conflicts:
	RecetApp/src/dad/recetapp/MainReceta.java