Tried to fix some issues with place slugs.
Bugfix: add photo link was broken on taxa/show.
Bugfix: taxon merges weren't setting iconic taxon for observations.
Merge branch 'master' into i18n

Conflicts:
	app/views/taxa/show.html.erb