Merge appointments and availability rules as event objects
Issue #596
new
Instead of having separate objects, merge them into one for faster rendering and easier use.
Already works like this for admin calendar.