Merge pull request #71 from jerrywell/6.5

Bug ZK-2152: Wrong Behaviour of Datebox when Overwriting Time
Bug ZK-2341: Nested cardlayout did not show correctly