Re-indented World and Entity header files
Updated change log
Removed friendship between Entity and World