Merge branch 'IaaS-PaaS'

Conflicts:
	IaaS-PaaS-research.markdown