Rearrange entity files Add descriptions to some Entity virtual methods Merge branch 'master' of sbox