Finished PartitionEntry loading code
Merge branch 'Develop'