Merge branch 'master' into web
Merge branch 'master' into web
new task: Ajax queries when selecting the action and the event are now working
Merge branch 'web' of github.com:tdubourg/ghome into web
Merge branch 'web' of github.com:tdubourg/ghome into web