modified load/save and cleaned up serializers and modified serializers to be more suitable for elasticsearch
resolved merge conflict