Updated the project's metadata
Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev
Minor documentation fixes
Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev
Minor documentation fixes

Conflicts:
	docs/installation.rst