Title geändert
Merge branch 'v0.2' into v0.3

Conflicts:
	index.html