Begining to transfer to EDX-Core
Merge branch 'master' of https://github.com/Electrodynamics/Electrodynamics