Previous branch version for #231 not based on development -> re-created the Cart update on top of development branch
Refactored the relational query into separate method
Reforming where query to return array of found CartReservations, not just an ActiveRecord relation
Merge pull request #413 from YaleSTC/231_update_all_in_cart

231 Cart should use update_all to change reserver_id or dates
Created app:setup task to replace application_setup_controller functionality
Removed app_setup_controller and replaced with app:setup rake task
Added redirect to AppConfig#edit action when user hasn't ever seen the app configs page before
Started work on application_controller_spec
Simplified edit method in app config controller
Merge pull request #417 from YaleSTC/415_setup_script

415 setup script
more work on application controller spec
Changes to application controller and spec, routes matchers updated gemfile.lock
resolved merge conflicts after merging in development
fixed merge conflicts again
Remade AppConfigsController spec in order to accommodate changes to app
changed catalog searches to get requests in order to allow bookmarking
Changed skip_before_filter to only apply to edit action in app configs controller
fixed tests broken by changes to database structure and reservations factory
fixed merge conflicts