Merge branch 'master' of https://github.com/AnalyticalGraphicsInc/cesium

Conflicts:
	Source/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js
	Source/Widgets/Timeline/Timeline.js