Finished talk activity layout
Merge branch 'richard_dev'

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