Making a second redirect to naturesbest2012...
Removing that second redirect I just added...
update CHN translation on July 22
Fixed bug #WEB-4570; fixed a couple of style issues
Merge branch '2013.05.14'
Oooops... taxon exemplar-setting code was ... well... bad.  This is actually a pretty significant re-write, but now it's working (and the code it quite a bit clearer to boot).

Conflicts:
	app/views/taxa/media/index.html.haml
Another attempt to fix the broken media tab with no exemplar.

Conflicts:
	app/views/taxa/media/index.html.haml
Removing merge file
Okay, fixing the exemplar image debocle.  ...At least, I'm pretty sure...
Fixed some tests broken on the branch.
Version replacing EOL footer.
WEB-4582 - description error message for links, text error message for text. HACK EDITION.
WEB-4563 improvements to agent names when adding associations. Note: don't mistype that as assing adultertations.
Merge branch 'bhl_in_footer'
Overview tab is self-healing for the exemplar image, if it's nil and there are really media.
moved the logic up a level so we can re-use it in TaxonMedia... which doesn't exist here, but hey. A two-stage deploy for this feature...
Merge pull request #96 from wjn99wjn/zh_trans

update CHN translation on July 22
Merge branch 'master' into statsd