adjust to changes on trunk - table user_data does no longer exist
fix autoloading issues
Merge branch 'master' into studip-2.3