problem
Merge branch 'master' of https://github.com/AIFDR/inasafe-doc

Conflicts:
	docs/source/user-docs/install.rst