Conflicts: HISTORY.md bower.json dist/vis.js dist/vis.map dist/vis.min.css dist/vis.min.js lib/network/Network.js lib/network/mixins/ManipulationMixin.js lib/timeline/component/ItemSet.js lib/timeline/component/graph2d_types/bar.js lib/timeline/component/item/Item.js package.json test/timeline.html