fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/event.xml
Merge remote-tracking branch 'origin/master'
removed space