Many changes to the way events and sub-events work
Merge branch 'master' of github.com:masterkoppa/fieldtrip.it