Merge branch 'master' of https://github.com/metagraph/metagraph

Conflicts:
	proposal/images/europe.pdf
	proposal/images/toolchain.png
Changes on WP5