~ changed event popup to comply with new stuff
Merge branch 'develop' of github.com:SmartBlocks/Organization into develop