Merge pull request #148 from JohnCremona/master

fixed e.c. isogeny classes for Sage version 6.2+
added Q-curves to TOC
Merge pull request #170 from davidfarmer/addQcurvestoTOC

added Q-curves to TOC
Merge branch 'master' into ecnf

Conflicts:
	lmfdb/templates/homepage.html