* merging.
Merge branch 'Features/organization' of github.com:SaltySoft/SmartBlocks into Features/organization
Merge branch 'Features/organization' of github.com:SaltySoft/SmartBlocks into Features/organization
* merging
* add change event on activity filters.