recoupled reset button
`wdemeuter' as titular and instructor
Merge remote-tracking branch 'origin/master' into nilsbranch
`tjdhondt' added too
Small refractoring of core and layout
Merge remote-tracking branch 'origin/youssefbranch' into youssefbranch
Merge pull request #162 from se1-1314/youssefbranch

Youssefbranch
Merge remote-tracking branch 'refs/remotes/origin/master' into calendar-refactor