adding trip events
Merge branch 'master' of https://github.com/meckd/xless-web