fix typo
Merge branch 'hotfix/0.2'
fix links
Merge branch 'hotfix/links' into develop

Conflicts:
	index.html