contents filled in as they are available now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	map_timeline/contents/extended_label.xml