Event manager is private
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/Vivo/Storage/PathBuilder/PathBuilder.php
Merge remote-tracking branch 'upstream/develop' into develop
Event is private
Merge pull request #185 from miroslavhajek/develop

Event manager is private