minor change to SIS script
Added listed taxon box to taxa/show if site has a place id, altered obs list.
Merge branch 'master' into i18n

Conflicts:
	app/controllers/taxa_controller.rb
	app/views/taxa/show.html.erb
	public/javascripts/application.js
Translated some cons status stuff.
Minor formatting change.
Merge branch 'master' into i18n

Conflicts:
	app/views/taxa/_conservation_status.html.haml