location field map JS functionality ready; styling updates
Merge branch 'master' into test/options