Tidided, corrected object dependencies.
Merge branch 'master' of git.otrs.com:otrs/otrs

Conflicts:
	Kernel/System/DynamicField/ObjectType/Ticket.pm