Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	data.rb
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	data.rb
restructure
was auch immer
Merge remote-tracking branch 'origin/develop'
neues layout, einfacher