Merge branch 'add_commitment' into event_ui
Bug fix for resizing month calendar when it hides commitments
Refactored some names, and added server testing for the entity manager