event detail
Merge branch 'master' of https://github.com/yedlosh/ivelge.git

Conflicts:
	app/src/main/res/values/strings.xml