Event hierarchy done
Merge branch 'master' of https://github.com/aleixrm/si2.git