Commitment time changes

*Uncommented time settings for Commitments, tests pass
Updated category files in models by adding a header
Added CategoryEntityManagerTest
Merge remote-tracking branch 'origin/testing' into ui_polish