1. initail commit of all rails 3 files in server
   Please enter the commit message for your changes. Lines starting
   with '#' will be ignored, and an empty messag aborts the commit.
   On branch master
   Changes to be committed:
     (use "git reset HEAD <file>..." to unstage)

	new file:   Gemfile
	new file:   Gemfile.lock
	new file:   README.rdoc
	new file:   Rakefile
	new file:   app/assets/images/rails.png
	new file:   app/assets/javascripts/application.js
	new file:   app/assets/stylesheets/application.css
	new file:   app/controllers/actors_controller.rb
	new file:   app/controllers/admin/actor_types_controller.rb
	new file:   app/controllers/admin/actors_controller.rb
	new file:   app/controllers/admin/campaigns_controller.rb
	new file:   app/controllers/admin/events_controller.rb
	new file:   app/controllers/admin/geographical_focuses_controller.rb
	new file:   app/controllers/admin/news_articles_controller.rb
	new file:   app/controllers/admin/resources_controller.rb
	new file:   app/controllers/admin/rss_feeds_controller.rb
	new file:   app/controllers/admin/sessions_controller.rb
	new file:   app/controllers/admin/users_controller.rb
	new file:   app/controllers/admin/venues_controller.rb
	new file:   app/controllers/admin_controller.rb
	new file:   app/controllers/application_controller.rb
	new file:   app/controllers/application_controller.rb.3
	new file:   app/controllers/campaigns_controller.rb
	new file:   app/controllers/events_controller.rb
	new file:   app/controllers/events_controller.rb~
	new file:   app/controllers/home_controller.rb
	new file:   app/controllers/newsletter_controller.rb
	new file:   app/controllers/pages_controller.rb
	new file:   app/controllers/resources_controller.rb
	new file:   app/controllers/search_controller.rb
	new file:   app/helpers/actors_helper.rb
	new file:   app/helpers/admin/actor_types_helper.rb
	new file:   app/helpers/admin/actors_helper.rb
	new file:   app/helpers/admin/events_helper.rb
	new file:   app/helpers/admin/geographical_focuses_helper.rb
	new file:   app/helpers/admin/news_articles_helper.rb
	new file:   app/helpers/admin/resources_helper.rb
	new file:   app/helpers/admin/sessions_helper.rb
	new file:   app/helpers/admin/users_helper.rb
	new file:   app/helpers/admin/venues_helper.rb
	new file:   app/helpers/admin_helper.rb
	new file:   app/helpers/application_helper.rb
	new file:   app/helpers/application_helper.rb.3
	new file:   app/helpers/campaigns_helper.rb
	new file:   app/helpers/events_helper.rb
	new file:   app/helpers/home_helper.rb
	new file:   app/helpers/newsletter_helper.rb
	new file:   app/helpers/pages_helper.rb
	new file:   app/helpers/related_items_helper.rb
	new file:   app/helpers/resources_helper.rb
	new file:   app/helpers/search_helper.rb
	new file:   app/helpers/site_wide_focuses_helper.rb
  	new file:   app/mailers/.gitkeep
  	new file:   app/models/.gitkeep
	new file:   app/models/activity_sphere.rb
	new file:   app/models/activity_sphereship.rb
	new file:   app/models/actor.rb
	new file:   app/models/actor_type.rb
	new file:   app/models/administrator.rb
	new file:   app/models/administrator_session.rb
	new file:   app/models/author.rb
	new file:   app/models/authorship.rb
	new file:   app/models/campaign.rb
	new file:   app/models/content_type.rb
	new file:   app/models/content_typeship.rb
	new file:   app/models/economic_sector.rb
	new file:   app/models/economic_sectorship.rb
	new file:   app/models/email.rb
	new file:   app/models/employment_sector.rb
	new file:   app/models/employment_sectorship.rb
	new file:   app/models/event.rb
	new file:   app/models/event.rb~
	new file:   app/models/geographical_focus.rb
	new file:   app/models/geographical_relationship.rb
	new file:   app/models/involvement.rb
	new file:   app/models/item_relation.rb
	new file:   app/models/language.rb
	new file:   app/models/languageship.rb
	new file:   app/models/link.rb
	new file:   app/models/news_article.rb
	new file:   app/models/newsletter.rb
	new file:   app/models/reform_type.rb
	new file:   app/models/reform_typeship.rb
	new file:   app/models/regulation_domain.rb
	new file:   app/models/regulation_domainship.rb
	new file:   app/models/resource.rb
  new file:   app/models/resource_type.rb
	new file:   app/models/role.rb
	new file:   app/models/rss_feed.rb
	new file:   app/models/saved_search.rb
	new file:   app/models/target_group.rb
	new file:   app/models/target_groupship.rb
	new file:   app/models/venue.rb
	new file:   app/views/admin/actor_types/_actor_type_form.html.erb
	new file:   app/views/admin/actor_types/_actor_type_table.html.erb
	new file:   app/views/admin/actor_types/_index_sidebar.html.erb
	new file:   app/views/admin/actor_types/edit.html.erb
  	new file:   app/views/admin/actor_types/index.html.erb
  	new file:   app/views/admin/actor_types/new.html.erb
  	new file:   app/views/admin/actors/_actor.html.erb
  	new file:   app/views/admin/actors/_actortable.html.erb
  	new file:   app/views/admin/actors/_event.html.erb
  	new file:   app/views/admin/actors/_general_actor_form.html.erb
  	new file:   app/views/admin/actors/_index_sidebar.html.erb
  	new file:   app/views/admin/actors/_related_resource_form.html.erb
  	new file:   app/views/admin/actors/_resource.html.erb
  	new file:   app/views/admin/actors/autocomplete_name.html.erb
  	new file:   app/views/admin/actors/edit.html.erb
  	new file:   app/views/admin/actors/index.html.erb
  	new file:   app/views/admin/actors/new.html.erb
  	new file:   app/views/admin/campaigns/_actor.html.erb
  	new file:   app/views/admin/campaigns/_campaigntable.html.erb
  	new file:   app/views/admin/campaigns/_general_campaign_form.html.erb
  	new file:   app/views/admin/campaigns/_index_sidebar.html.erb
  	new file:   app/views/admin/campaigns/_involved_actor.html.erb
  	new file:   app/views/admin/campaigns/_involved_actors_form.html.erb
  	new file:   app/views/admin/campaigns/_resource.html.erb
  	new file:   app/views/admin/campaigns/autocomplete_name.html.erb
  	new file:   app/views/admin/campaigns/edit.html.erb
  	new file:   app/views/admin/campaigns/index.html.erb
  	new file:   app/views/admin/campaigns/new.html.erb
  	new file:   app/views/admin/continents/_continent_form.html.erb
  	new file:   app/views/admin/continents/_continent_table.html.erb
  	new file:   app/views/admin/continents/_index_sidebar.html.erb
  	new file:   app/views/admin/continents/edit.html.erb
  	new file:   app/views/admin/continents/index.html.erb
  	new file:   app/views/admin/continents/new.html.erb
  	new file:   app/views/admin/countries/_country_form.html.erb
  	new file:   app/views/admin/countries/edit.html.erb
  	new file:   app/views/admin/countries/new.html.erb
  	new file:   app/views/admin/events/_actor.html.erb
  	new file:   app/views/admin/events/_author.html.erb
  new file:   app/views/admin/events/_eventtable.html.er
	new file:   app/views/admin/events/_general_event_form.html.erb
	new file:   app/views/admin/events/_index_sidebar.html.erb
	new file:   app/views/admin/events/_related_event.html.erb
	new file:   app/views/admin/events/_related_resource_form.html.erb
	new file:   app/views/admin/events/_resource.html.erb
	new file:   app/views/admin/events/auto_complete_for_actor_name.html.erb
	new file:   app/views/admin/events/autocomplete_name.html.erb
	new file:   app/views/admin/events/edit.html.erb
	new file:   app/views/admin/events/index.html.erb
	new file:   app/views/admin/events/new.html.erb
  	new file:   app/views/admin/geographical_focuses/index.html.erb
  	new file:   app/views/admin/news_articles/_index_sidebar.html.erb
  	new file:   app/views/admin/news_articles/_news_article_form.html.erb
  	new file:   app/views/admin/news_articles/_news_article_table.html.erb
  	new file:   app/views/admin/news_articles/edit.html.erb
  	new file:   app/views/admin/news_articles/index.html.erb
  	new file:   app/views/admin/news_articles/new.html.erb
  	new file:   app/views/admin/provinces/_province_form.html.erb
  	new file:   app/views/admin/provinces/edit.html.erb
  	new file:   app/views/admin/provinces/new.html.erb
  	new file:   app/views/admin/resources/_actor.html.erb
  	new file:   app/views/admin/resources/_author.html.erb
  	new file:   app/views/admin/resources/_author_form.html.erb
  	new file:   app/views/admin/resources/_authorship_resource_form.html.erb
  	new file:   app/views/admin/resources/_event.html.erb
  	new file:   app/views/admin/resources/_general_resource_form.html.erb
  	new file:   app/views/admin/resources/_import_form.erb
  	new file:   app/views/admin/resources/_index_sidebar.html.erb
  	new file:   app/views/admin/resources/_related_resource.html.erb
  	new file:   app/views/admin/resources/_related_resource_form.html.erb
  	new file:   app/views/admin/resources/_resourcetable.html.erb
  	new file:   app/views/admin/resources/auto_complete_for_author_last_name.html.erb
  	new file:   app/views/admin/resources/autocomplete_title.html.erb
  	new file:   app/views/admin/resources/edit.html.erb
  	new file:   app/views/admin/resources/import.html.erb
  	new file:   app/views/admin/resources/imported.html.erb
  	new file:   app/views/admin/resources/index.html.erb
  	new file:   app/views/admin/resources/new.html.erb
  	new file:   app/views/admin/rss_feeds/_rss_feed_form.html.erb
  	new file:   app/views/admin/rss_feeds/edit.html.erb
  	new file:   app/views/admin/rss_feeds/index.html.erb
  	new file:   app/views/admin/rss_feeds/new.html.erb
  	new file:   app/views/admin/sessions/new.html.erb
  	new file:   app/views/admin/shared/_asset.html.erb
  	new file:   app/views/admin/shared/_attachments_form.html.erb
  	new file:   app/views/admin/shared/_date_and_duration_form.html.erb
  	new file:   app/views/admin/shared/_dynamic_list_form.html.erb
  	new file:   app/views/admin/shared/_email.html.erb
  	new file:   app/views/admin/shared/_geographical_focus_selector.html.erb
  	new file:   app/views/admin/shared/_link.html.erb
  	new file:   app/views/admin/shared/_supportive_data_form.html.erb
  	new file:   app/views/admin/shared/_visibility_selector.html.erb
  	new file:   app/views/admin/shared/related_items/_form.html.erb
  	new file:   app/views/admin/users/_administrator_form.html.erb
  	new file:   app/views/admin/users/_administrator_table.html.erb
  	new file:   app/views/admin/users/_index_sidebar.html.erb
  	new file:   app/views/admin/users/edit.html.erb
  	new file:   app/views/admin/users/index.html.erb
  	new file:   app/views/admin/users/new.html.erb
  	new file:   app/views/admin/venues/_index_sidebar.html.erb
  	new file:   app/views/admin/venues/_venue_form.html.erb
  	new file:   app/views/admin/venues/_venuetable.html.erb
  	new file:   app/views/admin/venues/edit.html.erb
  	new file:   app/views/admin/venues/index.html.erb
  	new file:   app/views/admin/venues/new.html.erb
  	new file:   app/views/admin/venues/search_for_auto_complete.html.erb
  	new file:   app/views/events/_event_calendar.html.erb
  	new file:   app/views/events/index.html.erb
  	new file:   app/views/events/past.html.erb
  	new file:   app/views/home/_campaigns.html.erb
  	new file:   app/views/home/_events.html.erb
  	new file:   app/views/home/_news_items.html.erb
  	new file:   app/views/home/_resources_for_form_items.erb
  	new file:   app/views/home/index.html.erb
  	new file:   app/views/layouts/admin.html.erb
  	new file:   app/views/layouts/application.html.erb
  	new file:   app/views/layouts/default.html.erb
  	new file:   app/views/layouts/default.ris.erb
  	new file:   app/views/layouts/login.html.erb
  	new file:   app/views/layouts/print.html.erb
  	new file:   app/views/layouts_bak/application.html.erb
  	new file:   app/views/newsletter/show.html.erb
  	new file:   app/views/pages/404.html.erb
  	new file:   app/views/pages/_about_text.fr.html.erb
  	new file:   app/views/pages/_about_text.html.erb
  	new file:   app/views/pages/_donate_text.fr.html.erb
  	new file:   app/views/pages/_donate_text.html.erb
  	new file:   app/views/pages/_member_text.fr.html.erb
  	new file:   app/views/pages/_member_text.html.erb
  	new file:   app/views/pages/_subscribe_text.fr.html.erb
  	new file:   app/views/pages/_subscribe_text.html.erb
  	new file:   app/views/pages/about.html.erb
  	new file:   app/views/pages/become-a-member.html.erb
  	new file:   app/views/pages/contact.html.erb
  	new file:   app/views/pages/donate.html.erb
  	new file:   app/views/pages/subscribe.html.erb
  	new file:   app/views/pages/support-campaigns.html.erb
  	new file:   app/views/resources/news.html.erb
  	new file:   app/views/resources/show.ris.erb
  	new file:   app/views/search/_presentation_form.html.erb
  	new file:   app/views/search/_print_result_actor.html.erb
  	new file:   app/views/search/_print_result_document.html.erb
  	new file:   app/views/search/_print_result_event.html.erb
  	new file:   app/views/search/_search_form.html.erb
  	new file:   app/views/search/_search_result_actor.html.erb
  	new file:   app/views/search/_search_result_campaign.html.erb
  	new file:   app/views/search/_search_result_document.html.erb
  	new file:   app/views/search/_search_result_event.html.erb
  	new file:   app/views/search/index.html.erb
  	new file:   app/views/search/modify.html.erb
  	new file:   app/views/search/print.html.erb
  	new file:   app/views/search/results.csv.erb
  	new file:   app/views/search/results.html.erb
  	new file:   app/views/search/results.ris.erb
  	new file:   app/views/shared/_get_involved.html.erb
  	new file:   app/views/shared/_related.html.erb
  	new file:   app/views/shared/item_details.html.erb
  	new file:   config.ru
  	new file:   config/application.rb
  	new file:   config/boot.rb
  	new file:   config/boot.rb~
  	new file:   config/cucumber.yml
  	new file:   config/database.yml
  	new file:   config/database.yml.sample
  	new file:   config/deploy.rb
  	new file:   config/environment.rb
  	new file:   config/environments/cucumber.rb
  	new file:   config/environments/development.rb
  	new file:   config/environments/production.rb
  	new file:   config/environments/test.rb
  	new file:   config/heroku.yml
  	new file:   config/initializers/backtrace_silencers.rb
  	new file:   config/initializers/better_locale.rb
  	new file:   config/initializers/better_locale.rb~
  	new file:   config/initializers/i18n_helper.rb
  	new file:   config/initializers/inflections.rb
  	new file:   config/initializers/load_acts_as_record.rb
  	new file:   config/initializers/load_config.rb
  	new file:   config/initializers/load_config.rb~
  	new file:   config/initializers/load_ris_exporter.rb
  	new file:   config/initializers/load_ris_exporter.rb~
  	new file:   config/initializers/load_search_query.rb
  	new file:   config/initializers/load_search_query.rb~
  	new file:   config/initializers/mime_types.rb
  	new file:   config/initializers/new_rails_defaults.rb
  	new file:   config/initializers/secret_token.rb
  	new file:   config/initializers/session_store.rb
  	new file:   config/initializers/session_store.rb~
  	new file:   config/initializers/translatable_name.rb
  	new file:   config/initializers/translatable_name.rb~
  	new file:   config/initializers/wrap_parameters.rb
  	new file:   config/locales/defaults/en.yml
  	new file:   config/locales/defaults/es.yml
  	new file:   config/locales/defaults/fr.yml
  	new file:   config/locales/defaults/tl.yml
  	new file:   config/locales/en.yml
  	new file:   config/locales/es.yml
  	new file:   config/locales/fr.yml
  	new file:   config/locales/simple_form.en.yml
  	new file:   config/locales/tl.yml
  	new file:   config/preinitializer.rb
  	new file:   config/resource_types.yml
  	new file:   config/routes.rb
  	new file:   config/routes.rb~
  	new file:   config/s3.yml
  	new file:   config/s3.yml~
  	new file:   config/sunspot.yml
  	new file:   db/aa
  	new file:   db/development.sqlite3without data
  	new file:   db/development.sqlite44withdata
  	new file:   db/migrate/20090504032851_create_resource_types.rb
  	new file:   db/migrate/20090507191916_create_resources.rb
  	new file:   db/migrate/20090520211342_create_events.rb
  	new file:   db/migrate/20090521004551_create_venues.rb
  	new file:   db/migrate/20090522230938_create_authors.rb
  	new file:   db/migrate/20090522233248_create_authorships.rb
  	new file:   db/migrate/20090525125241_create_actor_types.rb
  	new file:   db/migrate/20090525125603_create_actors.rb
  	new file:   db/migrate/20090525202118_create_links.rb
  	new file:   db/migrate/20090526172409_create_economic_sectors.rb
  	new file:   db/migrate/20090526175459_create_economic_sectorships.rb
  	new file:   db/migrate/20090527160917_create_reform_types.rb
  	new file:   db/migrate/20090527162908_create_target_groups.rb
  	new file:   db/migrate/20090527165849_create_employment_sectors.rb
  	new file:   db/migrate/20090527172959_create_employment_sectorships.rb
  	new file:   db/migrate/20090527174726_create_target_groupships.rb
  	new file:   db/migrate/20090527175821_create_reform_typeships.rb
  	new file:   db/migrate/20090527181800_create_languages.rb
  	new file:   db/migrate/20090527182019_create_languageships.rb
  	new file:   db/migrate/20090527192649_create_geographical_focus.rb
  	new file:   db/migrate/20090528163955_create_geographical_relationships.rb
  	new file:   db/migrate/20090721205501_acts_as_taggable_migration.rb
  	new file:   db/migrate/20090722220353_create_news_articles.rb
  	new file:   db/migrate/20090722224554_create_administrators.rb
  	new file:   db/migrate/20090823184500_create_content_types.rb
  	new file:   db/migrate/20090823184627_create_content_typeships.rb
  	new file:   db/migrate/20090823190929_create_regulation_domains.rb
  	new file:   db/migrate/20090823191600_create_regulation_domainships.rb
  	new file:   db/migrate/20090827045710_add_newsworthy_to_resources.rb
  	new file:   db/migrate/20090828184533_create_slugs.rb
  	new file:   db/migrate/20090831230525_load_geographical_focuses.rb
  	new file:   db/migrate/20090901181911_add_site_wide_to_sectors.rb
  	new file:   db/migrate/20091007000120_add_file_attachment_to_resource.rb
  	new file:   db/migrate/20091106182608_create_roles.rb
  	new file:   db/migrate/20091114002152_add_fax_and_email_to_actors.rb
  	new file:   db/migrate/20091205195533_create_saved_searches.rb
  	new file:   db/migrate/20091217201657_create_related_models_join_table.rb
  	new file:   db/migrate/20100112210439_add_email_to_venue.rb
  	new file:   db/migrate/20100120180300_add_locked_to_geographical_focuses.rb
  	new file:   db/migrate/20100213025835_replace_publication_year_with_full_date.rb
  	new file:   db/migrate/20100217184757_add_defaultto_geographical_focus.rb
  	new file:   db/migrate/20100707192936_polymorphic_paperclip_migration.rb
  	new file:   db/migrate/20100707193103_remove_file_attachment_from_resource.rb
  	new file:   db/migrate/20100817190905_create_campaigns.rb
  	new file:   db/migrate/20101206234345_create_endorsements.rb
  	new file:   db/migrate/20101214190420_remove_homepage_from_actor.rb
  	new file:   db/migrate/20101217143836_create_emails.rb
  	new file:   db/migrate/20101217161737_remove_email_from_actors.rb
  	new file:   db/migrate/20110214171047_create_item_relations.rb
  	new file:   db/migrate/20110307015538_add_first_and_last_name_to_authors.rb
  	new file:   db/migrate/20110313053252_add_private_to_resources.rb
  	new file:   db/migrate/20110407212637_change_resource_title_to_text.rb
  	new file:   db/migrate/20110409173636_add_private_to_actors_events_campaigns.rb
  	new file:   db/migrate/20110510012718_create_rss_feeds.rb
  	new file:   db/migrate/20110527033005_create_activity_spheres.rb
  	new file:   db/migrate/20110601022403_add_special_collection_to_resources_and_actors.rb
  	new file:   db/migrate/20110601025615_add_private_notes_to_records.rb
  	new file:   db/migrate/20110601140148_add_private_to_assets.rb
  	new file:   db/migrate/20110601154623_add_full_text_to_resources.rb
  	new file:   db/migrate/20110603183310_change_actor_description_to_text.rb
  	new file:   db/migrate/20110610125548_change_endorsements_to_involvements.rb
  	new file:   db/migrate/20110618182753_add_indexes_to_metadata_tables.rb
  	new file:   db/migrate/20110706020802_add_organization_to_actors.rb
  	new file:   db/migrate/20110731220203_add_active_to_actors.rb
  	new file:   db/migrate/20120502042238_add_sessions_table.rb
  	new file:   db/schema.rb
  	new file:   db/seeds.rb
  	new file:   doc/README_FOR_APP
  	new file:   features/change_context.feature
  	new file:   features/export_actors.feature
  	new file:   features/export_resources.feature
  	new file:   features/import_resources.feature
  	new file:   features/manage_actors.feature
  	new file:   features/manage_authors.feature
  	new file:   features/manage_campaigns.feature
  	new file:   features/manage_events.feature
  	new file:   features/manage_resources.feature
  	new file:   features/rss_subscription.feature
  	new file:   features/search.feature
  	new file:   features/step_definitions/admin_steps.rb
  	new file:   features/step_definitions/global_steps.rb
  	new file:   features/step_definitions/login_steps.rb
  	new file:   features/step_definitions/selenium_steps.rb
  	new file:   features/step_definitions/send_keys_steps.rb
  	new file:   features/step_definitions/web_steps.rb
  	new file:   features/support/env.rb
  	new file:   features/support/paths.rb
  	new file:   features/support/send_keys.rb
  	new file:   features/uploads/sample.txt
  	new file:   features/view_actors.feature
  	new file:   features/view_campaigns.feature
  	new file:   features/view_events.feature
  	new file:   features/view_newsletter.feature
  	new file:   features/view_resources.feature
  	new file:   lib/acts_as_record.rb
  	new file:   lib/assets/.gitkeep
  	new file:   lib/email_campaign.rb
  	new file:   lib/imported_record.rb
  	new file:   lib/migrants_config.rb
  	new file:   lib/ris_exporter.rb
  	new file:   lib/ris_importer.rb
  	new file:   lib/routing_filter/better_locale.rb
  	new file:   lib/routing_filter/better_locale.rb~
  	new file:   lib/search_query.rb
  	new file:   lib/tasks/.gitkeep
  	new file:   public/404.html
  	new file:   public/422.html
  	new file:   public/500.html
  	new file:   public/favicon.ico
  	new file:   public/images/admin/icons/nav_left_red.png
  	new file:   public/images/admin/icons/progress.gif
  	new file:   public/images/arrow-beige-right.png
  	new file:   public/images/arrow-boxed-gray-right.png
  	new file:   public/images/arrow-down.png
  	new file:   public/images/arrow-green-right.png
  	new file:   public/images/arrow-red-down.png
  	new file:   public/images/arrow-red-up.png
  	new file:   public/images/arrow-up.png
  	new file:   public/images/beta.png
  	new file:   public/images/calendar_date_select/calendar.gif
  	new file:   public/images/check.png
  	new file:   public/images/checkbox.png
  	new file:   public/images/checkbox_sprite.png
  	new file:   public/images/diag.png
  	new file:   public/images/export.png
  	new file:   public/images/file_icon.png
  	new file:   public/images/geo-item-bg-clicked.png
  	new file:   public/images/geo-item-bg.png
  	new file:   public/images/header/agricultural_work.jpg
  	new file:   public/images/header/all.jpg
  	new file:   public/images/header/domestic_work.jpg
  	new file:   public/images/keyresource.png
  	new file:   public/images/logo-en.png
  	new file:   public/images/logo-es.png
  	new file:   public/images/logo-fr.png
  	new file:   public/images/logo-print-en.png
  	new file:   public/images/logo-print-es.png
  	new file:   public/images/logo-print-fr.png
  	new file:   public/images/logo-print-tl.png
  	new file:   public/images/logo-tl.png
  	new file:   public/images/new-search.png
  	new file:   public/images/print-all.png
  	new file:   public/images/print-page.png
  	new file:   public/images/red-arrow-down.png
  	new file:   public/images/red_badge_left.png
  	new file:   public/images/red_badge_right.png
  	new file:   public/images/refine.png
  	new file:   public/images/tab_corner_left.png
  	new file:   public/images/tab_corner_left_current.png
  	new file:   public/images/tab_corner_right.png
  	new file:   public/images/tab_corner_right_current.png
  	new file:   public/images/warning.png
  	new file:   public/javascripts/admin.js
  	new file:   public/javascripts/application.js
  	new file:   public/javascripts/calendar_date_select/calendar_date_select.js
  	new file:   public/javascripts/calendar_date_select/format_american.js
  	new file:   public/javascripts/calendar_date_select/format_db.js
  	new file:   public/javascripts/calendar_date_select/format_euro_24hr.js
  	new file:   public/javascripts/calendar_date_select/format_euro_24hr_ymd.js
  	new file:   public/javascripts/calendar_date_select/format_finnish.js
  	new file:   public/javascripts/calendar_date_select/format_hyphen_ampm.js
  	new file:   public/javascripts/calendar_date_select/format_iso_date.js
  	new file:   public/javascripts/calendar_date_select/format_italian.js
  	new file:   public/javascripts/calendar_date_select/locale/de.js
  	new file:   public/javascripts/calendar_date_select/locale/fi.js
  	new file:   public/javascripts/calendar_date_select/locale/fr.js
  	new file:   public/javascripts/calendar_date_select/locale/pl.js
  	new file:   public/javascripts/calendar_date_select/locale/pt.js
  	new file:   public/javascripts/calendar_date_select/locale/ru.js
  	new file:   public/javascripts/checklist.js
  	new file:   public/javascripts/controls.js
  	new file:   public/javascripts/delegate.js
  	new file:   public/javascripts/dragdrop.js
  	new file:   public/javascripts/effects.js
  	new file:   public/javascripts/locales.js
  	new file:   public/javascripts/prototype.js
  	new file:   public/robots.txt
  	new file:   public/stylesheets/admin.css
  	new file:   public/stylesheets/admin/checklist.css
  	new file:   public/stylesheets/calendar_date_select/blue.css
  	new file:   public/stylesheets/calendar_date_select/default.css
  	new file:   public/stylesheets/calendar_date_select/plain.css
  	new file:   public/stylesheets/calendar_date_select/red.css
  	new file:   public/stylesheets/calendar_date_select/silver.css
  	new file:   public/stylesheets/grid.css
  	new file:   public/stylesheets/ie.css
  	new file:   public/stylesheets/ie6.css
  	new file:   public/stylesheets/layout.css
  	new file:   public/stylesheets/nav.css
  	new file:   public/stylesheets/print.css
  	new file:   public/stylesheets/reset.css
  	new file:   public/stylesheets/sass/screen.scss
  	new file:   public/stylesheets/screen.css
  	new file:   public/stylesheets/text.css
  	new file:   script/rails
  	new file:   solr/conf/admin-extra.html
  	new file:   solr/conf/elevate.xml
  	new file:   solr/conf/mapping-ISOLatin1Accent.txt
  	new file:   solr/conf/protwords.txt
  	new file:   solr/conf/schema.xml
  	new file:   solr/conf/scripts.conf
  	new file:   solr/conf/solrconfig.xml
  	new file:   solr/conf/spellings.txt
  	new file:   solr/conf/stopwords.txt
  	new file:   solr/conf/synonyms.txt
  	new file:   solr/data/development/index/_0.fdt
  	new file:   solr/data/development/index/_0.fdx
  	new file:   solr/data/development/index/_0.fnm
  	new file:   solr/data/development/index/_0.frq
  	new file:   solr/data/development/index/_0.nrm
  	new file:   solr/data/development/index/_0.prx
  	new file:   solr/data/development/index/_0.tii
  	new file:   solr/data/development/index/_0.tis
  	new file:   solr/data/development/index/_1.fdt
  	new file:   solr/data/development/index/_1.fdx
  	new file:   solr/data/development/index/_1.fnm
  	new file:   solr/data/development/index/_1.frq
  	new file:   solr/data/development/index/_1.nrm
  	new file:   solr/data/development/index/_1.prx
  	new file:   solr/data/development/index/_1.tii
  	new file:   solr/data/development/index/_1.tis
  	new file:   solr/data/development/index/_2.fdt
  	new file:   solr/data/development/index/_2.fdx
  	new file:   solr/data/development/index/_2.fnm
  	new file:   solr/data/development/index/_2.frq
  	new file:   solr/data/development/index/_2.nrm
  	new file:   solr/data/development/index/_2.prx
  	new file:   solr/data/development/index/_2.tii
  	new file:   solr/data/development/index/_2.tis
  	new file:   solr/data/development/index/_3.fdt
  	new file:   solr/data/development/index/_3.fdx
  	new file:   solr/data/development/index/_3.fnm
  	new file:   solr/data/development/index/_3.frq
  	new file:   solr/data/development/index/_3.nrm
  	new file:   solr/data/development/index/_3.prx
  	new file:   solr/data/development/index/_3.tii
  	new file:   solr/data/development/index/_3.tis
  	new file:   solr/data/development/index/_k.fdt
  	new file:   solr/data/development/index/_k.fdx
  	new file:   solr/data/development/index/_k.fnm
  	new file:   solr/data/development/index/_k.frq
  	new file:   solr/data/development/index/_k.nrm
  	new file:   solr/data/development/index/_k.prx
  	new file:   solr/data/development/index/_k.tii
  	new file:   solr/data/development/index/_k.tis
  	new file:   solr/data/development/index/_k_3.del
  	new file:   solr/data/development/index/_l.fdt
  	new file:   solr/data/development/index/_l.fdx
  	new file:   solr/data/development/index/_l.fnm
  	new file:   solr/data/development/index/_l.frq
  	new file:   solr/data/development/index/_l.nrm
  	new file:   solr/data/development/index/_l.prx
  	new file:   solr/data/development/index/_l.tii
  	new file:   solr/data/development/index/_l.tis
  	new file:   solr/data/development/index/_m.fdt
  	new file:   solr/data/development/index/_m.fdx
  	new file:   solr/data/development/index/_m.fnm
  	new file:   solr/data/development/index/_m.frq
  	new file:   solr/data/development/index/_m.nrm
  	new file:   solr/data/development/index/_m.prx
  	new file:   solr/data/development/index/_m.tii
  	new file:   solr/data/development/index/_m.tis
  	new file:   solr/data/development/index/_n.fdt
  	new file:   solr/data/development/index/_n.fdx
  	new file:   solr/data/development/index/_n.fnm
  	new file:   solr/data/development/index/_n.frq
  	new file:   solr/data/development/index/_n.nrm
  	new file:   solr/data/development/index/_n.prx
  	new file:   solr/data/development/index/_n.tii
  	new file:   solr/data/development/index/_n.tis
  	new file:   solr/data/development/index/segments.gen
  	new file:   solr/data/development/index/segments_1
  	new file:   solr/data/development/index/segments_5
  	new file:   solr/data/development/index/segments_n
  	new file:   solr/data/development/spellchecker/segments.gen
  	new file:   solr/data/development/spellchecker/segments_1
  	new file:   solr/pids/development/sunspot-solr-development.pid
  	new file:   test/factories/activity_sphere.rb
  	new file:   test/factories/actor.rb
  	new file:   test/factories/actor_type.rb
  	new file:   test/factories/administrator.rb
  	new file:   test/factories/asset.rb
  	new file:   test/factories/author.rb
  	new file:   test/factories/campaign.rb
  	new file:   test/factories/content_type.rb
  	new file:   test/factories/economic_sector.rb
  	new file:   test/factories/email.rb
  	new file:   test/factories/event.rb
  	new file:   test/factories/geographical_focus.rb
  	new file:   test/factories/involved_actor.rb
  	new file:   test/factories/language.rb
  	new file:   test/factories/link.rb
  	new file:   test/factories/regulation_domain.rb
  	new file:   test/factories/resource.rb
  	new file:   test/factories/resource_type.rb
  	new file:   test/factories/rss_feed.rb
  	new file:   test/factories/target_group.rb
  	new file:   test/factories/venue.rb
  	new file:   test/fixtures/.gitkeep
  	new file:   test/fixtures/item_relations.yml
  	new file:   test/fixtures/rss_feeds.yml
  	new file:   test/functional/.gitkeep
  	new file:   test/functional/actors_controller_test.rb
  	new file:   test/functional/admin/actor_types_controller_test.rb
  	new file:   test/functional/admin/actors_controller_test.rb
  	new file:   test/functional/admin/campaigns_controller_test.rb
  	new file:   test/functional/admin/events_controller_test.rb
  	new file:   test/functional/admin/geographical_focuses_controller_test.rb
  	new file:   test/functional/admin/news_articles_controller_test.rb
  	new file:   test/functional/admin/resources_controller_test.rb
  	new file:   test/functional/admin/sessions_controller_test.rb
  	new file:   test/functional/admin/users_controller_test.rb
  	new file:   test/functional/admin/venues_controller_test.rb
  	new file:   test/functional/admin_controller_test.rb
  	new file:   test/functional/home_controller_test.rb
  	new file:   test/functional/newsletter_controller_test.rb
  	new file:   test/functional/pages_controller_test.rb
  	new file:   test/functional/resources_controller_test.rb
  	new file:   test/functional/search_controller_test.rb
  	new file:   test/integration/.gitkeep
  	new file:   test/performance/browsing_test.rb
  	new file:   test/support/valid_ris_data.txt
  	new file:   test/test_helper.rb
  	new file:   test/unit/.gitkeep
  	new file:   test/unit/actor_test.rb
  	new file:   test/unit/actor_type_test.rb
  	new file:   test/unit/administrator_test.rb
  	new file:   test/unit/author_test.rb
  	new file:   test/unit/authorship_test.rb
  	new file:   test/unit/campaign_test.rb
  	new file:   test/unit/content_type_test.rb
  	new file:   test/unit/content_typeship_test.rb
  	new file:   test/unit/economic_sector_test.rb
  	new file:   test/unit/economic_sectorship_test.rb
  	new file:   test/unit/email_test.rb
  	new file:   test/unit/employment_sector_test.rb
  	new file:   test/unit/employment_sectorship_test.rb
  	new file:   test/unit/event_test.rb
  	new file:   test/unit/geographical_focus_test.rb
  	new file:   test/unit/geographical_relationship_test.rb
  	new file:   test/unit/helpers/actors_helper_test.rb
  	new file:   test/unit/helpers/admin/actor_types_helper_test.rb
  	new file:   test/unit/helpers/admin/actors_helper_test.rb
  	new file:   test/unit/helpers/admin/events_helper_test.rb
  	new file:   test/unit/helpers/admin/geographical_focuses_helper_test.rb
  	new file:   test/unit/helpers/admin/news_articles_helper_test.rb
  	new file:   test/unit/helpers/admin/resources_helper_test.rb
  	new file:   test/unit/helpers/admin/sessions_helper_test.rb
  	new file:   test/unit/helpers/admin/users_helper_test.rb
  	new file:   test/unit/helpers/admin/venues_helper_test.rb
  	new file:   test/unit/helpers/admin_helper_test.rb
  	new file:   test/unit/helpers/application_helper_test.rb
  	new file:   test/unit/helpers/campaigns_helper_test.rb
  	new file:   test/unit/helpers/home_helper_test.rb
  	new file:   test/unit/helpers/newsletter_helper_test.rb
  	new file:   test/unit/helpers/pages_helper_test.rb
  	new file:   test/unit/helpers/resources_helper_test.rb
  	new file:   test/unit/helpers/search_helper_test.rb
  	new file:   test/unit/item_relation_test.rb
  	new file:   test/unit/language_test.rb
  	new file:   test/unit/languageship_test.rb
  	new file:   test/unit/link_test.rb
  	new file:   test/unit/news_article_test.rb
  	new file:   test/unit/reform_type_test.rb
  	new file:   test/unit/reform_typeship_test.rb
  	new file:   test/unit/regulation_domain_test.rb
  	new file:   test/unit/regulation_domainship_test.rb
  	new file:   test/unit/resource_test.rb
  	new file:   test/unit/resource_type_test.rb
  	new file:   test/unit/ris_exporter_test.rb
  	new file:   test/unit/ris_importer_test.rb
  	new file:   test/unit/role_test.rb
  	new file:   test/unit/rss_feed_test.rb
  	new file:   test/unit/saved_search_test.rb
  	new file:   test/unit/string_test.rb
  	new file:   test/unit/target_group_test.rb
  	new file:   test/unit/target_groupship_test.rb
  	new file:   test/unit/venue_test.rb
  	new file:   vendor/assets/javascripts/.gitkeep
  	new file:   vendor/assets/stylesheets/.gitkeep
  	new file:   vendor/plugins/.gitkeep
  	new file:   vendor/plugins/acts_as_category/CHANGELOG
  	new file:   vendor/plugins/acts_as_category/MIT-LICENSE
  	new file:   vendor/plugins/acts_as_category/README.textile
  	new file:   vendor/plugins/acts_as_category/Rakefile
  	new file:   vendor/plugins/acts_as_category/config/locales/de.yml
  	new file:   vendor/plugins/acts_as_category/config/locales/en.yml
  	new file:   vendor/plugins/acts_as_category/config/locales/se.yml
  	new file:   vendor/plugins/acts_as_category/db/migrate/create_categories.rb
  	new file:   vendor/plugins/acts_as_category/init.rb
  	new file:   vendor/plugins/acts_as_category/lib/active_record/acts/category.rb
  	new file:   vendor/plugins/acts_as_category/lib/active_record/acts/category_content.rb
  	new file:   vendor/plugins/acts_as_category/lib/acts_as_category_helper.rb
  	new file:   vendor/plugins/acts_as_category/test/category_test.rb
  	new file:   vendor/plugins/acts_as_category/test/scope_test.rb
  	new file:   vendor/plugins/acts_as_category/test/test_helper.rb
  	new file:   vendor/plugins/auto_complete/README
  	new file:   vendor/plugins/auto_complete/Rakefile
  	new file:   vendor/plugins/auto_complete/init.rb
  	new file:   vendor/plugins/auto_complete/lib/auto_complete.rb
  	new file:   vendor/plugins/auto_complete/lib/auto_complete_form_helper.rb
  	new file:   vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb
  	new file:   vendor/plugins/auto_complete/test/auto_complete_form_helper_test.rb
  	new file:   vendor/plugins/auto_complete/test/auto_complete_test.rb
  	new file:   vendor/plugins/calendar_helper/History.txt
  	new file:   vendor/plugins/calendar_helper/MIT-LICENSE
  	new file:   vendor/plugins/calendar_helper/Manifest.txt
  	new file:   vendor/plugins/calendar_helper/README.txt
  	new file:   vendor/plugins/calendar_helper/Rakefile
  	new file:   vendor/plugins/calendar_helper/about.yml
  	new file:   vendor/plugins/calendar_helper/generators/calendar_styles/calendar_styles_generator.rb
  	new file:   vendor/plugins/calendar_helper/generators/calendar_styles/templates/blue/style.css
  	new file:   vendor/plugins/calendar_helper/generators/calendar_styles/templates/grey/style.css
  	new file:   vendor/plugins/calendar_helper/generators/calendar_styles/templates/red/style.css
  	new file:   vendor/plugins/calendar_helper/init.rb
  	new file:   vendor/plugins/calendar_helper/lib/calendar_helper.rb
  	new file:   vendor/plugins/calendar_helper/test/test_calendar_helper.rb
  	new file:   vendor/plugins/citation_parser/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/.svn/entries
  	new file:   vendor/plugins/citation_parser/.svn/text-base/README.svn-base
  	new file:   vendor/plugins/citation_parser/.svn/text-base/Rakefile.svn-base
  	new file:   vendor/plugins/citation_parser/.svn/text-base/init.rb.svn-base
  	new file:   vendor/plugins/citation_parser/.svn/text-base/install.rb.svn-base
  	new file:   vendor/plugins/citation_parser/.svn/text-base/uninstall.rb.svn-base
  	new file:   vendor/plugins/citation_parser/README
  	new file:   vendor/plugins/citation_parser/Rakefile
  	new file:   vendor/plugins/citation_parser/init.rb
  	new file:   vendor/plugins/citation_parser/install.rb
  	new file:   vendor/plugins/citation_parser/lib/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/lib/.svn/entries
  	new file:   vendor/plugins/citation_parser/lib/.svn/text-base/base_xml_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/.svn/text-base/citation_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/base_xml_parser.rb
  	new file:   vendor/plugins/citation_parser/lib/citation_parser.rb
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/entries
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/text-base/medline_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/text-base/refworks_deprecated_xml_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/text-base/refworks_xml_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/.svn/text-base/ris_parser.rb.svn-base
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/medline_parser.rb
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/refworks_deprecated_xml_parser.rb
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/refworks_xml_parser.rb
  	new file:   vendor/plugins/citation_parser/lib/citation_parsers/ris_parser.rb
  	new file:   vendor/plugins/citation_parser/tasks/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/tasks/.svn/entries
  	new file:   vendor/plugins/citation_parser/tasks/.svn/text-base/citation_parser_tasks.rake.svn-base
  	new file:   vendor/plugins/citation_parser/tasks/citation_parser_tasks.rake
  	new file:   vendor/plugins/citation_parser/test/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/test/.svn/entries
  	new file:   vendor/plugins/citation_parser/test/.svn/text-base/citation_parser_test.rb.svn-base
  	new file:   vendor/plugins/citation_parser/test/citation_parser_test.rb
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/all-wcprops
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/entries
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.bib.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.deprecated.rxml.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.invalid-format.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.med.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.ris.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.rxml.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/.svn/text-base/papers.unicode.ris.svn-base
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.bib
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.deprecated.rxml
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.invalid-format
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.med
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.ris
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.rxml
  	new file:   vendor/plugins/citation_parser/test/fixtures/papers.unicode.ris
  	new file:   vendor/plugins/citation_parser/uninstall.rb
  	new file:   vendor/plugins/custom-err-msg/MIT-LICENSE
  	new file:   vendor/plugins/custom-err-msg/README
  	new file:   vendor/plugins/custom-err-msg/init.rb
  	new file:   vendor/plugins/custom-err-msg/lib/custom_error_message.rb
  	new file:   vendor/plugins/enkoder/LICENSE
  	new file:   vendor/plugins/enkoder/README
  	new file:   vendor/plugins/enkoder/init.rb
  	new file:   vendor/plugins/enkoder/lib/enkoder.rb
  	new file:   vendor/plugins/paperclippolymorph/MIT-LICENSE
  	new file:   vendor/plugins/paperclippolymorph/README.textile
  	new file:   vendor/plugins/paperclippolymorph/generators/polymorphic_paperclip/USAGE
  	new file:   vendor/plugins/paperclippolymorph/generators/polymorphic_paperclip/polymorphic_paperclip_generator.rb
  	new file:   vendor/plugins/paperclippolymorph/generators/polymorphic_paperclip/templates/migration.rb
  	new file:   vendor/plugins/paperclippolymorph/init.rb
  	new file:   vendor/plugins/paperclippolymorph/lib/acts_as_polymorphic_paperclip.rb
  	new file:   vendor/plugins/paperclippolymorph/lib/asset.rb
  	new file:   vendor/plugins/paperclippolymorph/lib/asset.rb~
  	new file:   vendor/plugins/paperclippolymorph/lib/attaching.rb
  	new file:   vendor/plugins/paperclippolymorph/spec/acts_as_polymorphic_paperclip_spec.rb
  	new file:   vendor/plugins/paperclippolymorph/spec/asset_spec.rb
  	new file:   vendor/plugins/paperclippolymorph/spec/db/database.yml
  	new file:   vendor/plugins/paperclippolymorph/spec/db/schema.rb
  	new file:   vendor/plugins/paperclippolymorph/spec/fixtures/assets/rails.png
  	new file:   vendor/plugins/paperclippolymorph/spec/fixtures/assets/sample.txt
  	new file:   vendor/plugins/paperclippolymorph/spec/spec_helper.rb
  	new file:   vendor/plugins/rails_upgrade/MIT-LICENSE
  	new file:   vendor/plugins/rails_upgrade/README.rdoc
  	new file:   vendor/plugins/rails_upgrade/Rakefile
  	new file:   vendor/plugins/rails_upgrade/init.rb
  	new file:   vendor/plugins/rails_upgrade/install.rb
  	new file:   vendor/plugins/rails_upgrade/lib/application_checker.rb
  	new file:   vendor/plugins/rails_upgrade/lib/gemfile_generator.rb
  	new file:   vendor/plugins/rails_upgrade/lib/new_configuration_generator.rb
  	new file:   vendor/plugins/rails_upgrade/lib/rails_upgrade.rb
  	new file:   vendor/plugins/rails_upgrade/lib/routes_upgrader.rb
  	new file:   vendor/plugins/rails_upgrade/lib/tasks/rails_upgrade_tasks.rake
  	new file:   vendor/plugins/rails_upgrade/test/application_checker_test.rb
  	new file:   vendor/plugins/rails_upgrade/test/gemfile_generator_test.rb
  	new file:   vendor/plugins/rails_upgrade/test/new_configuration_generator_test.rb
  	new file:   vendor/plugins/rails_upgrade/test/routes_upgrader_test.rb
  	new file:   vendor/plugins/rails_upgrade/test/test_helper.rb
  	new file:   vendor/plugins/rails_upgrade/uninstall.rb
  	new file:   vendor/plugins/simple_time_select/CHANGELOG
  	new file:   vendor/plugins/simple_time_select/MIT_LICENSE
  	new file:   vendor/plugins/simple_time_select/README
  	new file:   vendor/plugins/simple_time_select/Rakefile
  	new file:   vendor/plugins/simple_time_select/about.yml
  	new file:   vendor/plugins/simple_time_select/init.rb
  	new file:   vendor/plugins/simple_time_select/lib/simple_time_select.rb
  	new file:   vendor/plugins/simple_time_select/test/simple_time_select_test.rb
  	new file:   vendor/plugins/simple_time_select/test/test_helper.rb
  	new file:   vendor/plugins/tilt-1.3.3.gemspec~
Deleted unwanted files fron db directory
	deleted:    aa
	deleted:    development.sqlite3without data
	deleted:    development.sqlite44withdata
Issue #13: ArgumentError in Search#modify
Merge branch 'master' of github.com:shijupc/migrants
	modified:   Gemfile
	modified:   Gemfile
wiped Gemfile.lock re-ran bundle install
gem change
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   Gemfile
initial
	modified:   Gemfile
1. Fixed the issue [migrants] NoMethodError in Resources#show (#6)
	deleted:    app/helpers/application_helper.rb.3
	modified:   app/helpers/resources_helper.rb
Merge branch 'master' of http://github.com/shijupc/migrants

Conflicts:
	public/javascripts/locales.js
	solr/pids/development/sunspot-solr-development.pid
	modified:   Gemfile
	modified:   config/routes.rb
	modified:   config/routes.rb
	modified:   .gitignore
	new file:   db/development.sqlite3
	modified:   Gemfile
	modified:   config/environments/development.rb
Issue #4: Geographical focus issue