Cleaned up code, removed Netbeans pre generated comments.
Merge origin/MapGenerator into MapGenerator