More work done on testing.

modified:   Gemfile.lock
modified:   app/controllers/analysis_items_controller.rb
modified:   app/controllers/analysis_jobs_controller.rb
modified:   app/controllers/analysis_scripts_controller.rb
modified:   app/controllers/application_controller.rb
modified:   app/controllers/audio_events_controller.rb
modified:   app/controllers/audio_recordings_controller.rb
modified:   app/controllers/bookmarks_controller.rb
modified:   app/controllers/permissions_controller.rb
modified:   app/controllers/photos_controller.rb
modified:   app/controllers/progresses_controller.rb
modified:   app/controllers/projects_controller.rb
modified:   app/controllers/saved_searches_controller.rb
modified:   app/controllers/sites_controller.rb
modified:   app/controllers/tags_controller.rb
modified:   app/controllers/users_controller.rb
modified:   app/models/audio_event.rb
modified:   app/models/tag.rb
modified:   app/models/user.rb
modified:   app/serializers/audio_event_serializer.rb
new file:   app/serializers/progress_serializer.rb
modified:   db/migrate/20121025001857_create_users.rb
modified:   db/migrate/20121102043637_add_deleted_at_fields.rb
modified:   db/migrate/20121211011323_create_analysis_jobs.rb
modified:   db/schema.rb
modified:   spec/controllers/audio_events_controller_spec.rb
modified:   spec/controllers/audio_recordings_controller_spec.rb
modified:   spec/controllers/permissions_controller_spec.rb
modified:   spec/controllers/photos_controller_spec.rb
modified:   spec/controllers/users_controller_spec.rb
modified:   spec/factories/analysis_job_factory.rb
modified:   spec/factories/analysis_script_factory.rb
modified:   spec/factories/audio_recording_factory.rb
modified:   spec/models/tag_spec.rb
modified:   spec/spec_helper.rb
modified:   spec/support/api_examples_delete.rb
modified:   spec/support/api_examples_update.rb
modified:   spec/support/helpers.rb
Merge branch 'master' of https://github.com/QutBioacousticsResearchGroup/bioacoustic-workbench