Fix bug 316927 - Multiple categories should be allowed for Events/Tasks. r=philipp

--HG--
extra : rebase_source : 919edb1a17587a32135f24a2620d0cc279a67936