Pull from Master

Hoping this is in the right direction..trying to merge openemr master into mine.  Ignore if this is totally wrong.