event trigger bugfix
Merge branch 'develop' of github.com:psyburn/oboji.se into develop