Added expandable notifications (requires "pinch" gesture to open/close. Added code to reset notification counters/lists between loop iterations, now list conflict files by name and branch (viewable via expand). Takes awhile for conflict notification to show up (approx 30 seconds when it needs to check 25 pushes for conflicts, which is still faster than the "auto-refresh" rate of the notificationservice). Timestamp currently disabled for testing purposes.