After adding a taxon_relationship the page redirects if the type of relationship is different from the tab where the page is. Removed inherit_resources method call from controllers taht inherit from SimpleCrudController
Added abbreviation method to the change_type model
Added a few more code to the listing_changes management page
Fixed small bugs in import scripts. Replaced INITCAP with UPPER in the import scripts because it is more clear. Importing CMS species besides CITES. Fixed bug with associating listing changes with non-current countries
Merge branch 'master' of github.com:unepwcmc/SAPI

* 'master' of github.com:unepwcmc/SAPI:
  Fixed small bugs in import scripts. Replaced INITCAP with UPPER in the import scripts because it is more clear. Importing CMS species besides CITES. Fixed bug with associating listing changes with non-current countries
  Added a few more code to the listing_changes management page
  Added abbreviation method to the change_type model
  After adding a taxon_relationship the page redirects if the type of relationship is different from the tab where the page is. Removed inherit_resources method call from controllers taht inherit from SimpleCrudController
  First draft of the ListingChanges show page
  Fixed import script for species. Added routes, specs, controller and views for listing changes. ADded specs for taxon_relationships
  Added helper method to get attributes without id, and timestamps
  reduced line size
Merge branch 'master' into synonyms_management

* master:
  Fixed small bugs in import scripts. Replaced INITCAP with UPPER in the import scripts because it is more clear. Importing CMS species besides CITES. Fixed bug with associating listing changes with non-current countries
  Added a few more code to the listing_changes management page
  Added abbreviation method to the change_type model
  After adding a taxon_relationship the page redirects if the type of relationship is different from the tab where the page is. Removed inherit_resources method call from controllers taht inherit from SimpleCrudController
  First draft of the ListingChanges show page
  Fixed import script for species. Added routes, specs, controller and views for listing changes. ADded specs for taxon_relationships
  Added helper method to get attributes without id, and timestamps
  reduced line size
Changed taxon edit page to match new mockups; added edit function to
EditableList
Merge branch 'synonyms_management' of github.com:unepwcmc/SAPI into synonyms_management

* 'synonyms_management' of github.com:unepwcmc/SAPI:
  enabled adding synonyms from taxon concept page
  removed old require statement
  removed nested_form
  fixed common names
  started work towards unifying the way synonyms and common names are added and edited
  fixing the autocompletes
  fixed empty parent

Conflicts:
	app/controllers/admin/taxon_concepts_controller.rb
	app/models/taxon_concept.rb
	app/views/admin/taxon_concepts/edit.html.erb
Fixed form rendering caused by merge conflict