Manual merging of locations.js with pydelhi, sjcet, mozilla delhi, gndg fsugs

1 job for master