Two bugs, about allergies, and appointments

@dkayiwa, slow down with those changes to allergies; I think we need to analyze what went wrong here and clean things up correctly. :slight_smile:

I see that when allergies were added to openmrs-core (in TRUNK-4747) the AllergyType enum was changed from this:

public enum AllergenType {
    DRUG, FOOD, ENVIRONMENTAL
}

to this:

public enum AllergenType {
	DRUG,
	FOOD,
	ENVIRONMENT,
	ANIMAL,
	PLANT,
	POLLEN,
	OTHER
}

(Also this list is duplicated as AllergyType, which we should delete.)

Googling around I cannot find any explanation of why this changed. Unless @burke or @jteich asked us to do this, I propose we change this back to the intended design.