THISTED 5 - Integrate events import.
Merge branch 'THISTED-5' into thisted-clean