Added Presence start-end view.
merge fix
Review fixes.
Review fixes.
Conflict resolved.
Merge branch 'przemekmazurek-BUG_3857'