Fix references for the builder for PHP 5.4 compatibility
Merge branch 'staging' of github.com:Placester/builder into staging
map_id might be missing for a map view