final version
Merge branch 'master' of github.com:TimLeytens/DrupalCamp-Leuven