Merge pull request #366 from tedpet/integration

ERDEditDatePopupCommon.java