Merge EDD_API Dev Branch

Merges the new EDD_API class from #857