making links all one line
Merge branch 'master' of https://github.com/AIFDR/inasafe-doc

Conflicts:
	docs/source/general/scientific-references.rst