merge from master to czmlLayers.
fix bad merge to cesiumviewerwidget.
Make a few files match master to clean up diff slightly.
Fix bad merge.
Merge branch 'czmlLayers' of git://github.com/AnalyticalGraphicsInc/cesium into czmlLayers

Conflicts:
	Source/DynamicScene/CzmlDefaults.js
	Source/Widgets/Dojo/CesiumViewerWidget.js