Map perfomed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mega/src/main/res/layout/event_view.xml