fixed e.c. isogeny classes for Sage version 6.2+
Merge branch 'master' of https://github.com/LMFDB/lmfdb
Merge branch 'master' of https://github.com/LMFDB/lmfdb
Merge branch 'master' of https://github.com/LMFDB/lmfdb
Merge branch 'master' of https://github.com/LMFDB/lmfdb
Merge branch 'master' of github.com:LMFDB/lmfdb
Merge branch 'master' of github.com:JohnCremona/lmfdb
Merge branch 'master' of github.com:LMFDB/lmfdb
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 pull request #169 from jwj61/master

Conductor bound for computing Dirichlet characters of an abelian field
Fixing import process, moved and improved function for making nice
strings for special number fields, added subfield information for
number fields, updated acknowledgements.