update on event detail page
Merge branch 'hye-dev2'

Conflicts:
	OneBrick/app/src/main/java/org/onebrick/android/activities/EventInfoActivity.java