Merge Branche:

merge redo-EventDetailPage to Master