Merge pull request #157 from joola/feature/issue#155

#155 Beacon and Query merge into develop
#125 Cleanup
#113 Added security context to dispatch
- `run` now receives a `context` object as first param on every dispatch
Merge pull request #165 from joola/feature/issue#113

#113 Added security context to dispatch
Merged 'develop'.