Kathelijn says the branch name should start with a lowercase character...
removed obsolete buildconfig lines
Merge branch 'master' into events_refactoring