2to3 of the portal
Merge branch 'master' of https://github.com/Jumpscale/jumpscale_portal

Conflicts:
	lib/portal/docgenerator/Confluence2RST.py