content page update
color and button timeline
timeline
Merge remote-tracking branch 'origin/conflict2.23.2014'

Conflicts:
	map_timeline/content.html
	map_timeline/map.html
	map_timeline/timeline.html