fixed conflict
estmates for contacts
submodules
merged stage to stage
submod updates and fixed csv view escaping
submod update
Merge branch 'live' of github.com:zuha/ZUHA_PRIVATE into live
added a new option - short  - to the pricify function, and added propertydeveloper to the list of plugins.
Added a new function for recursively removing empty values, and resetting the keys if they're numeric.
Nothing big, just added a title
Made use of the recursive removal of empty values, so that we don't have a bunch of empty arrays in the meta table.
Fixed a problem with the admin bar, but I think it might have broke the back side admin nav bar. Will need to look again.
fixed a little bootstrap javascript error
Added a new javascript plugin, for showing multiple google maps on a single page. Now instead of sending the data to an element you just put the parameters into a div (see blockshares for an example) and then include the two js files you need -- google and this one -- and it will auto load a google map in it's place
submodules
code formatting
added a new field to the user's table for saving the last ip you logged in with
Added last ip field to the users table for saving the last ip that someone has logged in with.
submodules
Merge branch 'stage' of github.com:zuha/ZUHA_PRIVATE into stage