add geolocation form plugin
sort map lists by name
Merge branch 'master' into deploy
update various script urls for test site