update Gemfile.lock file on staging
Merge branch 'master' of github.com:sdbmich1/plumboard

'add regional search'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated Gemfile.lock'
Merge branch 'master' of github.com:sdbmich1/plumboard

'update gemfile'
Merge branch 'master' of github.com:sdbmich1/plumboard

'update category csv file to fix file naming issue'
saves schema.rb
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated listing parent for dup pixi; added job type code'
Merge branch 'master' of github.com:sdbmich1/plumboard

'restored map.js; added job type to include list for eager loading'
Merge branch 'master' of github.com:sdbmich1/plumboard

'added pixi post notice mailer'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated category image css to change font size'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated staging.rb to remove caching; fiexed user_mailer.rb & listing.rb'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated users_controller for js format; updated api_keys.yml for fs access on test server'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated board display to reset custom.css and resize.js'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated display logic to hide footer on main board to resolve pixi overlap issue'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated caching for listing pages & updated user search functionality'
Merge branch 'master' of github.com:sdbmich1/plumboard

'v1.103: updated home page; fixed pixi post errors;'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated pages controller to restore default methods to resolve 404 issue'
Merge branch 'master' of github.com:sdbmich1/plumboard

'updated application_helper.rb to add param to is_pending? method; added expired pixis logic & rake task'
Merge branch 'master' of github.com:sdbmich1/plumboard

'v1.104: added region to show pixi navbar; fixed pixi_price param; added @region instance var for home page'
Merge branch 'master' of github.com:sdbmich1/plumboard

'added s3 direct upload gem and logic'