Commented out code that caused trouble in Line 100 in maps.js and fixed syntax error caused by merging. NEEDS TO BE CHECKED BY DENNIS!