Converted effort allocation to be stored in hashmap, changes needed for serialization on shore
Added better SRU and effort allocation for the EPD VOCT used in serializing
Merge branch 'master' of github.com:dma-enav/EPD