combined output and event attributes on demo modules
Merge branch 'master' of https://github.com/OneID/developer