Merge remote-tracking branch 'brian/trunk' into trunk

Conflicts:
	fq_poly_templates.h
Added note about FLINT_DLL to code_conventions.txt.
Added definition of FLINT_DLL to config.h.
Added inv_series to fq_poly*.
Replaced some missing prototypes, added FLINT_DLL on some that were missed and
added div_series for fq_poly*.
Fixed a compiler warning.
Merge branch 'trunk' of github.com:wbhart/flint2 into trunk

Conflicts:
	fmpz_mod_poly.h
	fq_poly_templates.h