Agenda
MoreInfo
Merge branch 'alex_dev'

Conflicts:
	TedXEventApp/src/main/res/values/dimens.xml