fixes related to the philsquare stream model
Merge branch 'develop' of github.com:philsquare/PyroCMS-Module-Events-Manager into develop