Regression fix: streaming problems 2

Signed-off-by: Rafał Malinowski <rafal.malinowski@corp.bluecherry.net>
Renamed toolbar from Experimental to Main

Signed-off-by: Rafał Malinowski <rafal.malinowski@corp.bluecherry.net>
Merge pull request #95 from vogel/release-2.1.0

Regression fix: streaming problems 2